2022-02-11 09:07:11 +11:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
|
* Copyright 2005 Blender Foundation. All rights reserved. */
|
2020-12-02 13:25:25 +01:00
|
|
|
|
|
|
|
|
/** \file
|
|
|
|
|
* \ingroup modifiers
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <cstring>
|
|
|
|
|
#include <iostream>
|
|
|
|
|
#include <string>
|
|
|
|
|
|
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
|
2021-10-21 13:54:48 -05:00
|
|
|
#include "BLI_array.hh"
|
2020-12-02 13:25:25 +01:00
|
|
|
#include "BLI_listbase.h"
|
BLI: Refactor vector types & functions to use templates
This patch implements the vector types (i.e:`float2`) by making heavy
usage of templating. All vector functions are now outside of the vector
classes (inside the `blender::math` namespace) and are not vector size
dependent for the most part.
In the ongoing effort to make shaders less GL centric, we are aiming
to share more code between GLSL and C++ to avoid code duplication.
####Motivations:
- We are aiming to share UBO and SSBO structures between GLSL and C++.
This means we will use many of the existing vector types and others
we currently don't have (uintX, intX). All these variations were
asking for many more code duplication.
- Deduplicate existing code which is duplicated for each vector size.
- We also want to share small functions. Which means that vector
functions should be static and not in the class namespace.
- Reduce friction to use these types in new projects due to their
incompleteness.
- The current state of the `BLI_(float|double|mpq)(2|3|4).hh` is a
bit of a let down. Most clases are incomplete, out of sync with each
others with different codestyles, and some functions that should be
static are not (i.e: `float3::reflect()`).
####Upsides:
- Still support `.x, .y, .z, .w` for readability.
- Compact, readable and easilly extendable.
- All of the vector functions are available for all the vectors types
and can be restricted to certain types. Also template specialization
let us define exception for special class (like mpq).
- With optimization ON, the compiler unroll the loops and performance
is the same.
####Downsides:
- Might impact debugability. Though I would arge that the bugs are
rarelly caused by the vector class itself (since the operations are
quite trivial) but by the type conversions.
- Might impact compile time. I did not saw a significant impact since
the usage is not really widespread.
- Functions needs to be rewritten to support arbitrary vector length.
For instance, one can't call `len_squared_v3v3` in
`math::length_squared()` and call it a day.
- Type cast does not work with the template version of the `math::`
vector functions. Meaning you need to manually cast `float *` and
`(float *)[3]` to `float3` for the function calls.
i.e: `math::distance_squared(float3(nearest.co), positions[i]);`
- Some parts might loose in readability:
`float3::dot(v1.normalized(), v2.normalized())`
becoming
`math::dot(math::normalize(v1), math::normalize(v2))`
But I propose, when appropriate, to use
`using namespace blender::math;` on function local or file scope to
increase readability.
`dot(normalize(v1), normalize(v2))`
####Consideration:
- Include back `.length()` method. It is quite handy and is more C++
oriented.
- I considered the GLM library as a candidate for replacement. It felt
like too much for what we need and would be difficult to extend / modify
to our needs.
- I used Macros to reduce code in operators declaration and potential
copy paste bugs. This could reduce debugability and could be reverted.
- This touches `delaunay_2d.cc` and the intersection code. I would like
to know @howardt opinion on the matter.
- The `noexcept` on the copy constructor of `mpq(2|3)` is being removed.
But according to @JacquesLucke it is not a real problem for now.
I would like to give a huge thanks to @JacquesLucke who helped during this
and pushed me to reduce the duplication further.
Reviewed By: brecht, sergey, JacquesLucke
Differential Revision: https://developer.blender.org/D13791
2022-01-12 12:57:07 +01:00
|
|
|
#include "BLI_math_vec_types.hh"
|
2021-04-15 08:57:10 +02:00
|
|
|
#include "BLI_multi_value_map.hh"
|
2020-12-02 13:25:25 +01:00
|
|
|
#include "BLI_set.hh"
|
|
|
|
|
#include "BLI_string.h"
|
2021-10-21 13:54:48 -05:00
|
|
|
#include "BLI_string_search.h"
|
2020-12-02 13:25:25 +01:00
|
|
|
#include "BLI_utildefines.h"
|
|
|
|
|
|
2020-12-15 10:47:58 +11:00
|
|
|
#include "DNA_collection_types.h"
|
2020-12-02 13:25:25 +01:00
|
|
|
#include "DNA_defaults.h"
|
2021-05-27 11:06:08 -04:00
|
|
|
#include "DNA_material_types.h"
|
2020-12-02 13:25:25 +01:00
|
|
|
#include "DNA_mesh_types.h"
|
|
|
|
|
#include "DNA_meshdata_types.h"
|
|
|
|
|
#include "DNA_modifier_types.h"
|
|
|
|
|
#include "DNA_node_types.h"
|
|
|
|
|
#include "DNA_object_types.h"
|
|
|
|
|
#include "DNA_pointcloud_types.h"
|
|
|
|
|
#include "DNA_scene_types.h"
|
|
|
|
|
#include "DNA_screen_types.h"
|
2021-04-08 17:35:06 +02:00
|
|
|
#include "DNA_space_types.h"
|
|
|
|
|
#include "DNA_windowmanager_types.h"
|
2020-12-02 13:25:25 +01:00
|
|
|
|
2021-07-07 11:20:19 +02:00
|
|
|
#include "BKE_attribute_math.hh"
|
2020-12-02 13:25:25 +01:00
|
|
|
#include "BKE_customdata.h"
|
2022-04-01 08:40:45 -05:00
|
|
|
#include "BKE_geometry_fields.hh"
|
2021-04-08 12:19:09 -05:00
|
|
|
#include "BKE_geometry_set_instances.hh"
|
2021-01-13 08:13:57 -06:00
|
|
|
#include "BKE_global.h"
|
2020-12-02 13:25:25 +01:00
|
|
|
#include "BKE_idprop.h"
|
2021-11-05 11:19:12 -05:00
|
|
|
#include "BKE_lib_id.h"
|
2020-12-02 13:25:25 +01:00
|
|
|
#include "BKE_lib_query.h"
|
2021-04-08 17:35:06 +02:00
|
|
|
#include "BKE_main.h"
|
2020-12-02 13:25:25 +01:00
|
|
|
#include "BKE_mesh.h"
|
|
|
|
|
#include "BKE_modifier.h"
|
2022-05-30 12:54:07 +02:00
|
|
|
#include "BKE_node_runtime.hh"
|
2021-12-21 15:18:56 +01:00
|
|
|
#include "BKE_node_tree_update.h"
|
2021-04-08 17:35:06 +02:00
|
|
|
#include "BKE_object.h"
|
2020-12-02 13:25:25 +01:00
|
|
|
#include "BKE_pointcloud.h"
|
|
|
|
|
#include "BKE_screen.h"
|
|
|
|
|
#include "BKE_simulation.h"
|
2021-04-08 17:35:06 +02:00
|
|
|
#include "BKE_workspace.h"
|
2020-12-02 13:25:25 +01:00
|
|
|
|
|
|
|
|
#include "BLO_read_write.h"
|
|
|
|
|
|
|
|
|
|
#include "UI_interface.h"
|
2021-10-21 13:54:48 -05:00
|
|
|
#include "UI_interface.hh"
|
2020-12-02 13:25:25 +01:00
|
|
|
#include "UI_resources.h"
|
|
|
|
|
|
2021-09-21 17:17:40 -05:00
|
|
|
#include "BLT_translation.h"
|
|
|
|
|
|
2021-09-16 20:49:10 -05:00
|
|
|
#include "WM_types.h"
|
|
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
#include "RNA_access.h"
|
|
|
|
|
#include "RNA_enum_types.h"
|
2022-03-14 16:54:46 +01:00
|
|
|
#include "RNA_prototypes.h"
|
2020-12-02 13:25:25 +01:00
|
|
|
|
|
|
|
|
#include "DEG_depsgraph_build.h"
|
|
|
|
|
#include "DEG_depsgraph_query.h"
|
|
|
|
|
|
|
|
|
|
#include "MOD_modifiertypes.h"
|
|
|
|
|
#include "MOD_nodes.h"
|
2021-04-27 13:03:40 +02:00
|
|
|
#include "MOD_nodes_evaluator.hh"
|
2020-12-02 13:25:25 +01:00
|
|
|
#include "MOD_ui_common.h"
|
|
|
|
|
|
2021-11-05 11:19:12 -05:00
|
|
|
#include "ED_object.h"
|
2021-11-10 15:43:18 -06:00
|
|
|
#include "ED_screen.h"
|
2021-04-15 08:57:10 +02:00
|
|
|
#include "ED_spreadsheet.h"
|
2021-10-21 13:54:48 -05:00
|
|
|
#include "ED_undo.h"
|
2021-04-15 08:57:10 +02:00
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
#include "NOD_derived_node_tree.hh"
|
|
|
|
|
#include "NOD_geometry.h"
|
2021-07-07 11:20:19 +02:00
|
|
|
#include "NOD_geometry_nodes_eval_log.hh"
|
2021-09-28 12:05:42 -05:00
|
|
|
#include "NOD_node_declaration.hh"
|
2021-08-20 13:14:39 +02:00
|
|
|
|
2021-09-09 12:54:20 +02:00
|
|
|
#include "FN_field.hh"
|
2021-11-23 14:47:25 +01:00
|
|
|
#include "FN_field_cpp_type.hh"
|
2021-08-20 13:14:39 +02:00
|
|
|
#include "FN_multi_function.hh"
|
2020-12-02 13:25:25 +01:00
|
|
|
|
2021-10-21 13:54:48 -05:00
|
|
|
using blender::Array;
|
2021-09-09 09:43:00 -05:00
|
|
|
using blender::ColorGeometry4f;
|
2022-03-18 10:57:45 +01:00
|
|
|
using blender::CPPType;
|
2021-07-07 11:20:19 +02:00
|
|
|
using blender::destruct_ptr;
|
2020-12-02 13:25:25 +01:00
|
|
|
using blender::float3;
|
2021-03-06 16:51:06 +01:00
|
|
|
using blender::FunctionRef;
|
2022-03-19 08:26:29 +01:00
|
|
|
using blender::GMutablePointer;
|
|
|
|
|
using blender::GMutableSpan;
|
|
|
|
|
using blender::GPointer;
|
|
|
|
|
using blender::GVArray;
|
2020-12-02 13:25:25 +01:00
|
|
|
using blender::IndexRange;
|
|
|
|
|
using blender::Map;
|
2022-02-02 10:54:54 +01:00
|
|
|
using blender::MultiValueMap;
|
|
|
|
|
using blender::MutableSpan;
|
2020-12-02 13:25:25 +01:00
|
|
|
using blender::Set;
|
|
|
|
|
using blender::Span;
|
|
|
|
|
using blender::StringRef;
|
2021-02-24 15:59:44 +01:00
|
|
|
using blender::StringRefNull;
|
2020-12-02 13:25:25 +01:00
|
|
|
using blender::Vector;
|
2021-09-27 15:33:48 +02:00
|
|
|
using blender::bke::OutputAttribute;
|
2021-11-23 14:47:25 +01:00
|
|
|
using blender::fn::Field;
|
2021-09-27 15:33:48 +02:00
|
|
|
using blender::fn::GField;
|
2021-11-23 14:47:25 +01:00
|
|
|
using blender::fn::ValueOrField;
|
2022-02-02 10:54:54 +01:00
|
|
|
using blender::fn::ValueOrFieldCPPType;
|
2021-09-28 12:05:42 -05:00
|
|
|
using blender::nodes::FieldInferencingInterface;
|
2020-12-02 13:25:25 +01:00
|
|
|
using blender::nodes::GeoNodeExecParams;
|
2021-09-28 12:05:42 -05:00
|
|
|
using blender::nodes::InputSocketFieldType;
|
2021-07-07 11:20:19 +02:00
|
|
|
using blender::threading::EnumerableThreadSpecific;
|
2020-12-02 13:25:25 +01:00
|
|
|
using namespace blender::fn::multi_function_types;
|
2021-03-06 16:51:06 +01:00
|
|
|
using namespace blender::nodes::derived_node_tree_types;
|
2022-06-01 14:38:06 +10:00
|
|
|
using geo_log::eNamedAttrUsage;
|
2021-10-21 13:54:48 -05:00
|
|
|
using geo_log::GeometryAttributeInfo;
|
2020-12-02 13:25:25 +01:00
|
|
|
|
|
|
|
|
static void initData(ModifierData *md)
|
|
|
|
|
{
|
|
|
|
|
NodesModifierData *nmd = (NodesModifierData *)md;
|
|
|
|
|
|
|
|
|
|
BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(nmd, modifier));
|
|
|
|
|
|
|
|
|
|
MEMCPY_STRUCT_AFTER(nmd, DNA_struct_default_get(NodesModifierData), modifier);
|
|
|
|
|
}
|
|
|
|
|
|
2022-01-31 15:27:35 -06:00
|
|
|
static void add_used_ids_from_sockets(const ListBase &sockets, Set<ID *> &ids)
|
2020-12-02 13:25:25 +01:00
|
|
|
{
|
2022-01-31 15:27:35 -06:00
|
|
|
LISTBASE_FOREACH (const bNodeSocket *, socket, &sockets) {
|
|
|
|
|
switch (socket->type) {
|
|
|
|
|
case SOCK_OBJECT: {
|
2022-01-31 15:43:00 -06:00
|
|
|
if (Object *object = ((bNodeSocketValueObject *)socket->default_value)->value) {
|
2022-01-31 15:27:35 -06:00
|
|
|
ids.add(&object->id);
|
|
|
|
|
}
|
2022-01-31 15:43:00 -06:00
|
|
|
break;
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
2022-01-31 15:27:35 -06:00
|
|
|
case SOCK_COLLECTION: {
|
2022-01-31 15:43:00 -06:00
|
|
|
if (Collection *collection =
|
|
|
|
|
((bNodeSocketValueCollection *)socket->default_value)->value) {
|
2022-01-31 15:27:35 -06:00
|
|
|
ids.add(&collection->id);
|
|
|
|
|
}
|
2022-01-31 15:43:00 -06:00
|
|
|
break;
|
2020-12-11 17:47:58 +01:00
|
|
|
}
|
2022-01-31 15:27:35 -06:00
|
|
|
case SOCK_MATERIAL: {
|
2022-01-31 15:43:00 -06:00
|
|
|
if (Material *material = ((bNodeSocketValueMaterial *)socket->default_value)->value) {
|
2022-01-31 15:27:35 -06:00
|
|
|
ids.add(&material->id);
|
|
|
|
|
}
|
2022-01-31 15:43:00 -06:00
|
|
|
break;
|
2021-05-27 11:06:08 -04:00
|
|
|
}
|
2022-01-31 15:27:35 -06:00
|
|
|
case SOCK_TEXTURE: {
|
2022-01-31 15:43:00 -06:00
|
|
|
if (Tex *texture = ((bNodeSocketValueTexture *)socket->default_value)->value) {
|
2022-01-31 15:27:35 -06:00
|
|
|
ids.add(&texture->id);
|
|
|
|
|
}
|
2022-01-31 15:43:00 -06:00
|
|
|
break;
|
2021-05-27 11:06:08 -04:00
|
|
|
}
|
2022-01-31 15:27:35 -06:00
|
|
|
case SOCK_IMAGE: {
|
2022-01-31 15:43:00 -06:00
|
|
|
if (Image *image = ((bNodeSocketValueImage *)socket->default_value)->value) {
|
2022-01-31 15:27:35 -06:00
|
|
|
ids.add(&image->id);
|
|
|
|
|
}
|
2022-01-31 15:43:00 -06:00
|
|
|
break;
|
2021-10-14 14:18:24 +01:00
|
|
|
}
|
|
|
|
|
}
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2022-02-01 16:27:29 -06:00
|
|
|
/**
|
|
|
|
|
* \note We can only check properties here that cause the dependency graph to update relations when
|
|
|
|
|
* they are changed, otherwise there may be a missing relation after editing. So this could check
|
|
|
|
|
* more properties like whether the node is muted, but we would have to accept the cost of updating
|
|
|
|
|
* relations when those properties are changed.
|
|
|
|
|
*/
|
|
|
|
|
static bool node_needs_own_transform_relation(const bNode &node)
|
|
|
|
|
{
|
|
|
|
|
if (node.type == GEO_NODE_COLLECTION_INFO) {
|
|
|
|
|
const NodeGeometryCollectionInfo &storage = *static_cast<const NodeGeometryCollectionInfo *>(
|
|
|
|
|
node.storage);
|
|
|
|
|
return storage.transform_space == GEO_NODE_TRANSFORM_SPACE_RELATIVE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (node.type == GEO_NODE_OBJECT_INFO) {
|
|
|
|
|
const NodeGeometryObjectInfo &storage = *static_cast<const NodeGeometryObjectInfo *>(
|
|
|
|
|
node.storage);
|
|
|
|
|
return storage.transform_space == GEO_NODE_TRANSFORM_SPACE_RELATIVE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void process_nodes_for_depsgraph(const bNodeTree &tree,
|
|
|
|
|
Set<ID *> &ids,
|
|
|
|
|
bool &needs_own_transform_relation)
|
2020-12-02 13:25:25 +01:00
|
|
|
{
|
|
|
|
|
Set<const bNodeTree *> handled_groups;
|
|
|
|
|
|
|
|
|
|
LISTBASE_FOREACH (const bNode *, node, &tree.nodes) {
|
2022-01-31 15:27:35 -06:00
|
|
|
add_used_ids_from_sockets(node->inputs, ids);
|
|
|
|
|
add_used_ids_from_sockets(node->outputs, ids);
|
2020-12-02 13:25:25 +01:00
|
|
|
|
2021-04-08 16:25:09 -06:00
|
|
|
if (ELEM(node->type, NODE_GROUP, NODE_CUSTOM_GROUP)) {
|
2020-12-02 13:25:25 +01:00
|
|
|
const bNodeTree *group = (bNodeTree *)node->id;
|
|
|
|
|
if (group != nullptr && handled_groups.add(group)) {
|
2022-02-01 16:27:29 -06:00
|
|
|
process_nodes_for_depsgraph(*group, ids, needs_own_transform_relation);
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
}
|
2022-02-01 16:27:29 -06:00
|
|
|
needs_own_transform_relation |= node_needs_own_transform_relation(*node);
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-13 08:13:57 -06:00
|
|
|
static void find_used_ids_from_settings(const NodesModifierSettings &settings, Set<ID *> &ids)
|
|
|
|
|
{
|
|
|
|
|
IDP_foreach_property(
|
|
|
|
|
settings.properties,
|
|
|
|
|
IDP_TYPE_FILTER_ID,
|
|
|
|
|
[](IDProperty *property, void *user_data) {
|
|
|
|
|
Set<ID *> *ids = (Set<ID *> *)user_data;
|
|
|
|
|
ID *id = IDP_Id(property);
|
|
|
|
|
if (id != nullptr) {
|
|
|
|
|
ids->add(id);
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
&ids);
|
|
|
|
|
}
|
|
|
|
|
|
2021-04-26 16:35:22 +02:00
|
|
|
/* We don't know exactly what attributes from the other object we will need. */
|
|
|
|
|
static const CustomData_MeshMasks dependency_data_mask{CD_MASK_PROP_ALL | CD_MASK_MDEFORMVERT,
|
|
|
|
|
CD_MASK_PROP_ALL,
|
|
|
|
|
CD_MASK_PROP_ALL,
|
|
|
|
|
CD_MASK_PROP_ALL,
|
|
|
|
|
CD_MASK_PROP_ALL};
|
|
|
|
|
|
|
|
|
|
static void add_collection_relation(const ModifierUpdateDepsgraphContext *ctx,
|
|
|
|
|
Collection &collection)
|
|
|
|
|
{
|
|
|
|
|
DEG_add_collection_geometry_relation(ctx->node, &collection, "Nodes Modifier");
|
|
|
|
|
DEG_add_collection_geometry_customdata_mask(ctx->node, &collection, &dependency_data_mask);
|
|
|
|
|
}
|
2021-02-22 20:26:51 +01:00
|
|
|
|
2021-02-12 12:03:38 -06:00
|
|
|
static void add_object_relation(const ModifierUpdateDepsgraphContext *ctx, Object &object)
|
|
|
|
|
{
|
|
|
|
|
DEG_add_object_relation(ctx->node, &object, DEG_OB_COMP_TRANSFORM, "Nodes Modifier");
|
|
|
|
|
if (&(ID &)object != &ctx->object->id) {
|
2021-04-26 16:35:22 +02:00
|
|
|
if (object.type == OB_EMPTY && object.instance_collection != nullptr) {
|
|
|
|
|
add_collection_relation(ctx, *object.instance_collection);
|
2021-02-22 20:26:51 +01:00
|
|
|
}
|
2021-05-26 16:06:01 +02:00
|
|
|
else if (DEG_object_has_geometry_component(&object)) {
|
2021-02-12 12:03:38 -06:00
|
|
|
DEG_add_object_relation(ctx->node, &object, DEG_OB_COMP_GEOMETRY, "Nodes Modifier");
|
2021-04-26 16:35:22 +02:00
|
|
|
DEG_add_customdata_mask(ctx->node, &object, &dependency_data_mask);
|
2021-02-12 12:03:38 -06:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
|
|
|
|
|
{
|
|
|
|
|
NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
|
2022-01-31 15:27:35 -06:00
|
|
|
if (nmd->node_group == nullptr) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DEG_add_node_tree_output_relation(ctx->node, nmd->node_group, "Nodes Modifier");
|
|
|
|
|
|
2022-02-01 16:27:29 -06:00
|
|
|
bool needs_own_transform_relation = false;
|
2022-01-31 15:27:35 -06:00
|
|
|
Set<ID *> used_ids;
|
|
|
|
|
find_used_ids_from_settings(nmd->settings, used_ids);
|
2022-02-01 16:27:29 -06:00
|
|
|
process_nodes_for_depsgraph(*nmd->node_group, used_ids, needs_own_transform_relation);
|
2022-01-31 15:27:35 -06:00
|
|
|
for (ID *id : used_ids) {
|
|
|
|
|
switch ((ID_Type)GS(id->name)) {
|
|
|
|
|
case ID_OB: {
|
|
|
|
|
Object *object = reinterpret_cast<Object *>(id);
|
|
|
|
|
add_object_relation(ctx, *object);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case ID_GR: {
|
|
|
|
|
Collection *collection = reinterpret_cast<Collection *>(id);
|
|
|
|
|
add_collection_relation(ctx, *collection);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case ID_IM:
|
|
|
|
|
case ID_TE: {
|
|
|
|
|
DEG_add_generic_id_relation(ctx->node, id, "Nodes Modifier");
|
|
|
|
|
}
|
|
|
|
|
default: {
|
|
|
|
|
/* Purposefully don't add relations for materials. While there are material sockets,
|
|
|
|
|
* the pointers are only passed around as handles rather than dereferenced. */
|
|
|
|
|
break;
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2022-02-01 16:27:29 -06:00
|
|
|
|
|
|
|
|
if (needs_own_transform_relation) {
|
|
|
|
|
DEG_add_modifier_to_transform_relation(ctx->node, "Nodes Modifier");
|
|
|
|
|
}
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
|
2021-12-15 14:51:58 -06:00
|
|
|
static bool check_tree_for_time_node(const bNodeTree &tree,
|
|
|
|
|
Set<const bNodeTree *> &r_checked_trees)
|
2021-12-09 11:50:25 -06:00
|
|
|
{
|
2021-12-15 14:51:58 -06:00
|
|
|
if (!r_checked_trees.add(&tree)) {
|
2021-12-09 11:50:25 -06:00
|
|
|
return false;
|
|
|
|
|
}
|
2021-12-15 14:51:58 -06:00
|
|
|
LISTBASE_FOREACH (const bNode *, node, &tree.nodes) {
|
2021-12-09 11:50:25 -06:00
|
|
|
if (node->type == GEO_NODE_INPUT_SCENE_TIME) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
if (node->type == NODE_GROUP) {
|
2021-12-15 14:51:58 -06:00
|
|
|
const bNodeTree *sub_tree = reinterpret_cast<const bNodeTree *>(node->id);
|
2021-12-15 15:00:20 -06:00
|
|
|
if (sub_tree && check_tree_for_time_node(*sub_tree, r_checked_trees)) {
|
2021-12-09 11:50:25 -06:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2022-04-01 15:27:11 +02:00
|
|
|
static bool dependsOnTime(struct Scene *UNUSED(scene), ModifierData *md)
|
2021-12-09 11:50:25 -06:00
|
|
|
{
|
2021-12-15 14:51:58 -06:00
|
|
|
const NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
|
|
|
|
|
const bNodeTree *tree = nmd->node_group;
|
2021-12-09 11:50:25 -06:00
|
|
|
if (tree == nullptr) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
2021-12-15 14:51:58 -06:00
|
|
|
Set<const bNodeTree *> checked_trees;
|
|
|
|
|
return check_tree_for_time_node(*tree, checked_trees);
|
2021-12-09 11:50:25 -06:00
|
|
|
}
|
|
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData)
|
|
|
|
|
{
|
|
|
|
|
NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
|
|
|
|
|
walk(userData, ob, (ID **)&nmd->node_group, IDWALK_CB_USER);
|
|
|
|
|
|
|
|
|
|
struct ForeachSettingData {
|
|
|
|
|
IDWalkFunc walk;
|
|
|
|
|
void *userData;
|
|
|
|
|
Object *ob;
|
|
|
|
|
} settings = {walk, userData, ob};
|
|
|
|
|
|
|
|
|
|
IDP_foreach_property(
|
|
|
|
|
nmd->settings.properties,
|
|
|
|
|
IDP_TYPE_FILTER_ID,
|
|
|
|
|
[](IDProperty *id_prop, void *user_data) {
|
|
|
|
|
ForeachSettingData *settings = (ForeachSettingData *)user_data;
|
|
|
|
|
settings->walk(
|
|
|
|
|
settings->userData, settings->ob, (ID **)&id_prop->data.pointer, IDWALK_CB_USER);
|
|
|
|
|
},
|
|
|
|
|
&settings);
|
|
|
|
|
}
|
|
|
|
|
|
2021-02-03 14:39:24 +01:00
|
|
|
static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void *userData)
|
|
|
|
|
{
|
|
|
|
|
walk(userData, ob, md, "texture");
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
static bool isDisabled(const struct Scene *UNUSED(scene),
|
|
|
|
|
ModifierData *md,
|
|
|
|
|
bool UNUSED(useRenderParams))
|
|
|
|
|
{
|
|
|
|
|
NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
|
|
|
|
|
|
|
|
|
|
if (nmd->node_group == nullptr) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2021-04-22 12:48:59 +02:00
|
|
|
static bool logging_enabled(const ModifierEvalContext *ctx)
|
|
|
|
|
{
|
|
|
|
|
if (!DEG_is_active(ctx->depsgraph)) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
if ((ctx->flag & MOD_APPLY_ORCO) != 0) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2021-09-16 20:49:10 -05:00
|
|
|
static const std::string use_attribute_suffix = "_use_attribute";
|
|
|
|
|
static const std::string attribute_name_suffix = "_attribute_name";
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* \return Whether using an attribute to input values of this type is supported.
|
|
|
|
|
*/
|
|
|
|
|
static bool socket_type_has_attribute_toggle(const bNodeSocket &socket)
|
|
|
|
|
{
|
|
|
|
|
return ELEM(socket.type, SOCK_FLOAT, SOCK_VECTOR, SOCK_BOOLEAN, SOCK_RGBA, SOCK_INT);
|
|
|
|
|
}
|
|
|
|
|
|
2021-09-28 12:05:42 -05:00
|
|
|
/**
|
|
|
|
|
* \return Whether using an attribute to input values of this type is supported, and the node
|
|
|
|
|
* group's input for this socket accepts a field rather than just single values.
|
|
|
|
|
*/
|
|
|
|
|
static bool input_has_attribute_toggle(const bNodeTree &node_tree, const int socket_index)
|
|
|
|
|
{
|
2022-05-30 12:54:07 +02:00
|
|
|
BLI_assert(node_tree.runtime->field_inferencing_interface);
|
|
|
|
|
const FieldInferencingInterface &field_interface =
|
|
|
|
|
*node_tree.runtime->field_inferencing_interface;
|
2021-09-28 12:05:42 -05:00
|
|
|
return field_interface.inputs[socket_index] != InputSocketFieldType::None;
|
|
|
|
|
}
|
|
|
|
|
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
static IDProperty *id_property_create_from_socket(const bNodeSocket &socket)
|
2020-12-02 13:25:25 +01:00
|
|
|
{
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
switch (socket.type) {
|
|
|
|
|
case SOCK_FLOAT: {
|
|
|
|
|
bNodeSocketValueFloat *value = (bNodeSocketValueFloat *)socket.default_value;
|
|
|
|
|
IDPropertyTemplate idprop = {0};
|
|
|
|
|
idprop.f = value->value;
|
|
|
|
|
IDProperty *property = IDP_New(IDP_FLOAT, &idprop, socket.identifier);
|
|
|
|
|
IDPropertyUIDataFloat *ui_data = (IDPropertyUIDataFloat *)IDP_ui_data_ensure(property);
|
|
|
|
|
ui_data->base.rna_subtype = value->subtype;
|
|
|
|
|
ui_data->min = ui_data->soft_min = (double)value->min;
|
|
|
|
|
ui_data->max = ui_data->soft_max = (double)value->max;
|
|
|
|
|
ui_data->default_value = value->value;
|
|
|
|
|
return property;
|
|
|
|
|
}
|
|
|
|
|
case SOCK_INT: {
|
|
|
|
|
bNodeSocketValueInt *value = (bNodeSocketValueInt *)socket.default_value;
|
|
|
|
|
IDPropertyTemplate idprop = {0};
|
|
|
|
|
idprop.i = value->value;
|
|
|
|
|
IDProperty *property = IDP_New(IDP_INT, &idprop, socket.identifier);
|
|
|
|
|
IDPropertyUIDataInt *ui_data = (IDPropertyUIDataInt *)IDP_ui_data_ensure(property);
|
|
|
|
|
ui_data->base.rna_subtype = value->subtype;
|
|
|
|
|
ui_data->min = ui_data->soft_min = value->min;
|
|
|
|
|
ui_data->max = ui_data->soft_max = value->max;
|
|
|
|
|
ui_data->default_value = value->value;
|
|
|
|
|
return property;
|
|
|
|
|
}
|
|
|
|
|
case SOCK_VECTOR: {
|
|
|
|
|
bNodeSocketValueVector *value = (bNodeSocketValueVector *)socket.default_value;
|
|
|
|
|
IDPropertyTemplate idprop = {0};
|
|
|
|
|
idprop.array.len = 3;
|
|
|
|
|
idprop.array.type = IDP_FLOAT;
|
|
|
|
|
IDProperty *property = IDP_New(IDP_ARRAY, &idprop, socket.identifier);
|
|
|
|
|
copy_v3_v3((float *)IDP_Array(property), value->value);
|
|
|
|
|
IDPropertyUIDataFloat *ui_data = (IDPropertyUIDataFloat *)IDP_ui_data_ensure(property);
|
|
|
|
|
ui_data->base.rna_subtype = value->subtype;
|
|
|
|
|
ui_data->min = ui_data->soft_min = (double)value->min;
|
|
|
|
|
ui_data->max = ui_data->soft_max = (double)value->max;
|
|
|
|
|
ui_data->default_array = (double *)MEM_mallocN(sizeof(double[3]), "mod_prop_default");
|
|
|
|
|
ui_data->default_array_len = 3;
|
2021-09-08 18:44:35 -05:00
|
|
|
for (const int i : IndexRange(3)) {
|
|
|
|
|
ui_data->default_array[i] = double(value->value[i]);
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
}
|
|
|
|
|
return property;
|
|
|
|
|
}
|
2021-09-09 09:43:00 -05:00
|
|
|
case SOCK_RGBA: {
|
|
|
|
|
bNodeSocketValueRGBA *value = (bNodeSocketValueRGBA *)socket.default_value;
|
|
|
|
|
IDPropertyTemplate idprop = {0};
|
|
|
|
|
idprop.array.len = 4;
|
|
|
|
|
idprop.array.type = IDP_FLOAT;
|
|
|
|
|
IDProperty *property = IDP_New(IDP_ARRAY, &idprop, socket.identifier);
|
|
|
|
|
copy_v4_v4((float *)IDP_Array(property), value->value);
|
|
|
|
|
IDPropertyUIDataFloat *ui_data = (IDPropertyUIDataFloat *)IDP_ui_data_ensure(property);
|
|
|
|
|
ui_data->base.rna_subtype = PROP_COLOR;
|
|
|
|
|
ui_data->default_array = (double *)MEM_mallocN(sizeof(double[4]), __func__);
|
|
|
|
|
ui_data->default_array_len = 4;
|
2022-02-21 13:01:37 -05:00
|
|
|
ui_data->min = 0.0;
|
|
|
|
|
ui_data->max = FLT_MAX;
|
|
|
|
|
ui_data->soft_min = 0.0;
|
|
|
|
|
ui_data->soft_max = 1.0;
|
2021-09-09 09:43:00 -05:00
|
|
|
for (const int i : IndexRange(4)) {
|
|
|
|
|
ui_data->default_array[i] = double(value->value[i]);
|
|
|
|
|
}
|
|
|
|
|
return property;
|
|
|
|
|
}
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
case SOCK_BOOLEAN: {
|
|
|
|
|
bNodeSocketValueBoolean *value = (bNodeSocketValueBoolean *)socket.default_value;
|
|
|
|
|
IDPropertyTemplate idprop = {0};
|
|
|
|
|
idprop.i = value->value != 0;
|
|
|
|
|
IDProperty *property = IDP_New(IDP_INT, &idprop, socket.identifier);
|
|
|
|
|
IDPropertyUIDataInt *ui_data = (IDPropertyUIDataInt *)IDP_ui_data_ensure(property);
|
|
|
|
|
ui_data->min = ui_data->soft_min = 0;
|
|
|
|
|
ui_data->max = ui_data->soft_max = 1;
|
|
|
|
|
ui_data->default_value = value->value != 0;
|
|
|
|
|
return property;
|
|
|
|
|
}
|
|
|
|
|
case SOCK_STRING: {
|
|
|
|
|
bNodeSocketValueString *value = (bNodeSocketValueString *)socket.default_value;
|
|
|
|
|
IDProperty *property = IDP_NewString(
|
|
|
|
|
value->value, socket.identifier, BLI_strnlen(value->value, sizeof(value->value)) + 1);
|
|
|
|
|
IDPropertyUIDataString *ui_data = (IDPropertyUIDataString *)IDP_ui_data_ensure(property);
|
|
|
|
|
ui_data->default_value = BLI_strdup(value->value);
|
|
|
|
|
return property;
|
|
|
|
|
}
|
|
|
|
|
case SOCK_OBJECT: {
|
|
|
|
|
bNodeSocketValueObject *value = (bNodeSocketValueObject *)socket.default_value;
|
|
|
|
|
IDPropertyTemplate idprop = {0};
|
|
|
|
|
idprop.id = (ID *)value->value;
|
|
|
|
|
return IDP_New(IDP_ID, &idprop, socket.identifier);
|
|
|
|
|
}
|
|
|
|
|
case SOCK_COLLECTION: {
|
|
|
|
|
bNodeSocketValueCollection *value = (bNodeSocketValueCollection *)socket.default_value;
|
|
|
|
|
IDPropertyTemplate idprop = {0};
|
|
|
|
|
idprop.id = (ID *)value->value;
|
|
|
|
|
return IDP_New(IDP_ID, &idprop, socket.identifier);
|
|
|
|
|
}
|
|
|
|
|
case SOCK_TEXTURE: {
|
|
|
|
|
bNodeSocketValueTexture *value = (bNodeSocketValueTexture *)socket.default_value;
|
|
|
|
|
IDPropertyTemplate idprop = {0};
|
|
|
|
|
idprop.id = (ID *)value->value;
|
|
|
|
|
return IDP_New(IDP_ID, &idprop, socket.identifier);
|
|
|
|
|
}
|
2021-10-14 14:18:24 +01:00
|
|
|
case SOCK_IMAGE: {
|
|
|
|
|
bNodeSocketValueImage *value = (bNodeSocketValueImage *)socket.default_value;
|
|
|
|
|
IDPropertyTemplate idprop = {0};
|
|
|
|
|
idprop.id = (ID *)value->value;
|
|
|
|
|
return IDP_New(IDP_ID, &idprop, socket.identifier);
|
|
|
|
|
}
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
case SOCK_MATERIAL: {
|
|
|
|
|
bNodeSocketValueMaterial *value = (bNodeSocketValueMaterial *)socket.default_value;
|
2020-12-02 13:25:25 +01:00
|
|
|
IDPropertyTemplate idprop = {0};
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
idprop.id = (ID *)value->value;
|
|
|
|
|
return IDP_New(IDP_ID, &idprop, socket.identifier);
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
}
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
return nullptr;
|
|
|
|
|
}
|
2020-12-02 13:25:25 +01:00
|
|
|
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
static bool id_property_type_matches_socket(const bNodeSocket &socket, const IDProperty &property)
|
|
|
|
|
{
|
|
|
|
|
switch (socket.type) {
|
|
|
|
|
case SOCK_FLOAT:
|
|
|
|
|
return ELEM(property.type, IDP_FLOAT, IDP_DOUBLE);
|
|
|
|
|
case SOCK_INT:
|
|
|
|
|
return property.type == IDP_INT;
|
|
|
|
|
case SOCK_VECTOR:
|
|
|
|
|
return property.type == IDP_ARRAY && property.subtype == IDP_FLOAT && property.len == 3;
|
2021-09-09 09:43:00 -05:00
|
|
|
case SOCK_RGBA:
|
|
|
|
|
return property.type == IDP_ARRAY && property.subtype == IDP_FLOAT && property.len == 4;
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
case SOCK_BOOLEAN:
|
|
|
|
|
return property.type == IDP_INT;
|
|
|
|
|
case SOCK_STRING:
|
|
|
|
|
return property.type == IDP_STRING;
|
|
|
|
|
case SOCK_OBJECT:
|
|
|
|
|
case SOCK_COLLECTION:
|
|
|
|
|
case SOCK_TEXTURE:
|
2021-10-14 14:18:24 +01:00
|
|
|
case SOCK_IMAGE:
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
case SOCK_MATERIAL:
|
|
|
|
|
return property.type == IDP_ID;
|
|
|
|
|
}
|
|
|
|
|
BLI_assert_unreachable();
|
|
|
|
|
return false;
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
static void init_socket_cpp_value_from_property(const IDProperty &property,
|
|
|
|
|
const eNodeSocketDatatype socket_value_type,
|
|
|
|
|
void *r_value)
|
2020-12-02 13:25:25 +01:00
|
|
|
{
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
switch (socket_value_type) {
|
2020-12-02 13:25:25 +01:00
|
|
|
case SOCK_FLOAT: {
|
2021-09-09 12:54:20 +02:00
|
|
|
float value = 0.0f;
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
if (property.type == IDP_FLOAT) {
|
2021-09-09 12:54:20 +02:00
|
|
|
value = IDP_Float(&property);
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
}
|
|
|
|
|
else if (property.type == IDP_DOUBLE) {
|
2021-09-09 12:54:20 +02:00
|
|
|
value = (float)IDP_Double(&property);
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
}
|
2021-11-23 14:47:25 +01:00
|
|
|
new (r_value) ValueOrField<float>(value);
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
break;
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
case SOCK_INT: {
|
2021-09-09 12:54:20 +02:00
|
|
|
int value = IDP_Int(&property);
|
2021-11-23 14:47:25 +01:00
|
|
|
new (r_value) ValueOrField<int>(value);
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
break;
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
case SOCK_VECTOR: {
|
2021-09-09 12:54:20 +02:00
|
|
|
float3 value;
|
|
|
|
|
copy_v3_v3(value, (const float *)IDP_Array(&property));
|
2021-11-23 14:47:25 +01:00
|
|
|
new (r_value) ValueOrField<float3>(value);
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
break;
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
2021-09-09 09:43:00 -05:00
|
|
|
case SOCK_RGBA: {
|
|
|
|
|
blender::ColorGeometry4f value;
|
|
|
|
|
copy_v4_v4((float *)value, (const float *)IDP_Array(&property));
|
2021-11-23 14:47:25 +01:00
|
|
|
new (r_value) ValueOrField<ColorGeometry4f>(value);
|
2021-09-09 09:43:00 -05:00
|
|
|
break;
|
|
|
|
|
}
|
2020-12-02 13:25:25 +01:00
|
|
|
case SOCK_BOOLEAN: {
|
2021-09-09 12:54:20 +02:00
|
|
|
bool value = IDP_Int(&property) != 0;
|
2021-11-23 14:47:25 +01:00
|
|
|
new (r_value) ValueOrField<bool>(value);
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
break;
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
case SOCK_STRING: {
|
2021-09-09 12:54:20 +02:00
|
|
|
std::string value = IDP_String(&property);
|
2021-11-23 14:47:25 +01:00
|
|
|
new (r_value) ValueOrField<std::string>(std::move(value));
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
break;
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
2021-01-13 08:13:57 -06:00
|
|
|
case SOCK_OBJECT: {
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
ID *id = IDP_Id(&property);
|
|
|
|
|
Object *object = (id && GS(id->name) == ID_OB) ? (Object *)id : nullptr;
|
|
|
|
|
*(Object **)r_value = object;
|
|
|
|
|
break;
|
2021-01-13 08:13:57 -06:00
|
|
|
}
|
|
|
|
|
case SOCK_COLLECTION: {
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
ID *id = IDP_Id(&property);
|
|
|
|
|
Collection *collection = (id && GS(id->name) == ID_GR) ? (Collection *)id : nullptr;
|
|
|
|
|
*(Collection **)r_value = collection;
|
|
|
|
|
break;
|
2021-01-13 08:13:57 -06:00
|
|
|
}
|
2021-05-27 11:06:08 -04:00
|
|
|
case SOCK_TEXTURE: {
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
ID *id = IDP_Id(&property);
|
|
|
|
|
Tex *texture = (id && GS(id->name) == ID_TE) ? (Tex *)id : nullptr;
|
|
|
|
|
*(Tex **)r_value = texture;
|
|
|
|
|
break;
|
2021-05-27 11:06:08 -04:00
|
|
|
}
|
2021-10-14 14:18:24 +01:00
|
|
|
case SOCK_IMAGE: {
|
|
|
|
|
ID *id = IDP_Id(&property);
|
|
|
|
|
Image *image = (id && GS(id->name) == ID_IM) ? (Image *)id : nullptr;
|
|
|
|
|
*(Image **)r_value = image;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2021-05-27 11:06:08 -04:00
|
|
|
case SOCK_MATERIAL: {
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
ID *id = IDP_Id(&property);
|
|
|
|
|
Material *material = (id && GS(id->name) == ID_MA) ? (Material *)id : nullptr;
|
|
|
|
|
*(Material **)r_value = material;
|
|
|
|
|
break;
|
2021-05-27 11:06:08 -04:00
|
|
|
}
|
2020-12-02 13:25:25 +01:00
|
|
|
default: {
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
BLI_assert_unreachable();
|
|
|
|
|
break;
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void MOD_nodes_update_interface(Object *object, NodesModifierData *nmd)
|
|
|
|
|
{
|
|
|
|
|
if (nmd->node_group == nullptr) {
|
2022-04-28 08:39:30 -05:00
|
|
|
if (nmd->settings.properties) {
|
|
|
|
|
IDP_FreeProperty(nmd->settings.properties);
|
|
|
|
|
nmd->settings.properties = nullptr;
|
|
|
|
|
}
|
2020-12-02 13:25:25 +01:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
IDProperty *old_properties = nmd->settings.properties;
|
|
|
|
|
{
|
|
|
|
|
IDPropertyTemplate idprop = {0};
|
|
|
|
|
nmd->settings.properties = IDP_New(IDP_GROUP, &idprop, "Nodes Modifier Settings");
|
|
|
|
|
}
|
|
|
|
|
|
2021-09-28 12:05:42 -05:00
|
|
|
int socket_index;
|
|
|
|
|
LISTBASE_FOREACH_INDEX (bNodeSocket *, socket, &nmd->node_group->inputs, socket_index) {
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
IDProperty *new_prop = id_property_create_from_socket(*socket);
|
|
|
|
|
if (new_prop == nullptr) {
|
|
|
|
|
/* Out of the set of supported input sockets, only
|
|
|
|
|
* geometry sockets aren't added to the modifier. */
|
|
|
|
|
BLI_assert(socket->type == SOCK_GEOMETRY);
|
2020-12-02 13:25:25 +01:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
new_prop->flag |= IDP_FLAG_OVERRIDABLE_LIBRARY;
|
|
|
|
|
if (socket->description[0] != '\0') {
|
|
|
|
|
IDPropertyUIData *ui_data = IDP_ui_data_ensure(new_prop);
|
|
|
|
|
ui_data->description = BLI_strdup(socket->description);
|
|
|
|
|
}
|
|
|
|
|
IDP_AddToGroup(nmd->settings.properties, new_prop);
|
2020-12-02 13:25:25 +01:00
|
|
|
|
|
|
|
|
if (old_properties != nullptr) {
|
|
|
|
|
IDProperty *old_prop = IDP_GetPropertyFromGroup(old_properties, socket->identifier);
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
if (old_prop != nullptr && id_property_type_matches_socket(*socket, *old_prop)) {
|
|
|
|
|
/* #IDP_CopyPropertyContent replaces the UI data as well, which we don't (we only
|
|
|
|
|
* want to replace the values). So release it temporarily and replace it after. */
|
|
|
|
|
IDPropertyUIData *ui_data = new_prop->ui_data;
|
|
|
|
|
new_prop->ui_data = nullptr;
|
2020-12-02 13:25:25 +01:00
|
|
|
IDP_CopyPropertyContent(new_prop, old_prop);
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
if (new_prop->ui_data != nullptr) {
|
|
|
|
|
IDP_ui_data_free(new_prop);
|
|
|
|
|
}
|
|
|
|
|
new_prop->ui_data = ui_data;
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
}
|
2021-09-16 20:49:10 -05:00
|
|
|
|
2021-10-18 12:58:30 +02:00
|
|
|
if (socket_type_has_attribute_toggle(*socket)) {
|
2021-09-16 20:49:10 -05:00
|
|
|
const std::string use_attribute_id = socket->identifier + use_attribute_suffix;
|
|
|
|
|
const std::string attribute_name_id = socket->identifier + attribute_name_suffix;
|
|
|
|
|
|
|
|
|
|
IDPropertyTemplate idprop = {0};
|
|
|
|
|
IDProperty *use_attribute_prop = IDP_New(IDP_INT, &idprop, use_attribute_id.c_str());
|
|
|
|
|
IDP_AddToGroup(nmd->settings.properties, use_attribute_prop);
|
|
|
|
|
|
|
|
|
|
IDProperty *attribute_prop = IDP_New(IDP_STRING, &idprop, attribute_name_id.c_str());
|
|
|
|
|
IDP_AddToGroup(nmd->settings.properties, attribute_prop);
|
|
|
|
|
|
2022-04-28 08:39:30 -05:00
|
|
|
if (old_properties == nullptr) {
|
|
|
|
|
if (socket->default_attribute_name && socket->default_attribute_name[0] != '\0') {
|
|
|
|
|
IDP_AssignString(attribute_prop, socket->default_attribute_name, MAX_NAME);
|
|
|
|
|
IDP_Int(use_attribute_prop) = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
2021-09-16 20:49:10 -05:00
|
|
|
IDProperty *old_prop_use_attribute = IDP_GetPropertyFromGroup(old_properties,
|
|
|
|
|
use_attribute_id.c_str());
|
|
|
|
|
if (old_prop_use_attribute != nullptr) {
|
|
|
|
|
IDP_CopyPropertyContent(use_attribute_prop, old_prop_use_attribute);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
IDProperty *old_attribute_name_prop = IDP_GetPropertyFromGroup(old_properties,
|
|
|
|
|
attribute_name_id.c_str());
|
|
|
|
|
if (old_attribute_name_prop != nullptr) {
|
|
|
|
|
IDP_CopyPropertyContent(attribute_prop, old_attribute_name_prop);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
|
2021-09-27 15:33:48 +02:00
|
|
|
LISTBASE_FOREACH (bNodeSocket *, socket, &nmd->node_group->outputs) {
|
|
|
|
|
if (!socket_type_has_attribute_toggle(*socket)) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const std::string idprop_name = socket->identifier + attribute_name_suffix;
|
|
|
|
|
IDProperty *new_prop = IDP_NewString("", idprop_name.c_str(), MAX_NAME);
|
|
|
|
|
if (socket->description[0] != '\0') {
|
|
|
|
|
IDPropertyUIData *ui_data = IDP_ui_data_ensure(new_prop);
|
|
|
|
|
ui_data->description = BLI_strdup(socket->description);
|
|
|
|
|
}
|
|
|
|
|
IDP_AddToGroup(nmd->settings.properties, new_prop);
|
|
|
|
|
|
2022-04-28 08:39:30 -05:00
|
|
|
if (old_properties == nullptr) {
|
|
|
|
|
if (socket->default_attribute_name && socket->default_attribute_name[0] != '\0') {
|
|
|
|
|
IDP_AssignString(new_prop, socket->default_attribute_name, MAX_NAME);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
2021-09-27 15:33:48 +02:00
|
|
|
IDProperty *old_prop = IDP_GetPropertyFromGroup(old_properties, idprop_name.c_str());
|
|
|
|
|
if (old_prop != nullptr) {
|
|
|
|
|
/* #IDP_CopyPropertyContent replaces the UI data as well, which we don't (we only
|
|
|
|
|
* want to replace the values). So release it temporarily and replace it after. */
|
|
|
|
|
IDPropertyUIData *ui_data = new_prop->ui_data;
|
|
|
|
|
new_prop->ui_data = nullptr;
|
|
|
|
|
IDP_CopyPropertyContent(new_prop, old_prop);
|
|
|
|
|
if (new_prop->ui_data != nullptr) {
|
|
|
|
|
IDP_ui_data_free(new_prop);
|
|
|
|
|
}
|
|
|
|
|
new_prop->ui_data = ui_data;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
if (old_properties != nullptr) {
|
|
|
|
|
IDP_FreeProperty(old_properties);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DEG_id_tag_update(&object->id, ID_RECALC_GEOMETRY);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void initialize_group_input(NodesModifierData &nmd,
|
2021-09-28 12:05:42 -05:00
|
|
|
const OutputSocketRef &socket,
|
2020-12-02 13:25:25 +01:00
|
|
|
void *r_value)
|
|
|
|
|
{
|
2021-09-28 12:05:42 -05:00
|
|
|
const bNodeSocketType &socket_type = *socket.typeinfo();
|
|
|
|
|
const bNodeSocket &bsocket = *socket.bsocket();
|
2022-05-31 18:52:27 +02:00
|
|
|
const eNodeSocketDatatype socket_data_type = static_cast<eNodeSocketDatatype>(bsocket.type);
|
2020-12-02 13:25:25 +01:00
|
|
|
if (nmd.settings.properties == nullptr) {
|
2021-09-28 12:05:42 -05:00
|
|
|
socket_type.get_geometry_nodes_cpp_value(bsocket, r_value);
|
2020-12-02 13:25:25 +01:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
const IDProperty *property = IDP_GetPropertyFromGroup(nmd.settings.properties,
|
2021-09-28 12:05:42 -05:00
|
|
|
socket.identifier().c_str());
|
2020-12-02 13:25:25 +01:00
|
|
|
if (property == nullptr) {
|
2021-09-28 12:05:42 -05:00
|
|
|
socket_type.get_geometry_nodes_cpp_value(bsocket, r_value);
|
2020-12-02 13:25:25 +01:00
|
|
|
return;
|
|
|
|
|
}
|
2021-09-28 12:05:42 -05:00
|
|
|
if (!id_property_type_matches_socket(bsocket, *property)) {
|
|
|
|
|
socket_type.get_geometry_nodes_cpp_value(bsocket, r_value);
|
2021-01-13 08:13:57 -06:00
|
|
|
return;
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
|
2021-09-28 12:05:42 -05:00
|
|
|
if (!input_has_attribute_toggle(*nmd.node_group, socket.index())) {
|
2022-05-31 18:52:27 +02:00
|
|
|
init_socket_cpp_value_from_property(*property, socket_data_type, r_value);
|
2021-09-16 21:54:14 -05:00
|
|
|
return;
|
2021-09-16 20:49:10 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const IDProperty *property_use_attribute = IDP_GetPropertyFromGroup(
|
2021-09-28 12:05:42 -05:00
|
|
|
nmd.settings.properties, (socket.identifier() + use_attribute_suffix).c_str());
|
2021-09-16 20:49:10 -05:00
|
|
|
const IDProperty *property_attribute_name = IDP_GetPropertyFromGroup(
|
2021-09-28 12:05:42 -05:00
|
|
|
nmd.settings.properties, (socket.identifier() + attribute_name_suffix).c_str());
|
2021-09-16 20:49:10 -05:00
|
|
|
if (property_use_attribute == nullptr || property_attribute_name == nullptr) {
|
2022-05-31 18:52:27 +02:00
|
|
|
init_socket_cpp_value_from_property(*property, socket_data_type, r_value);
|
2021-09-16 20:49:10 -05:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const bool use_attribute = IDP_Int(property_use_attribute) != 0;
|
|
|
|
|
if (use_attribute) {
|
|
|
|
|
const StringRef attribute_name{IDP_String(property_attribute_name)};
|
2022-05-31 18:52:27 +02:00
|
|
|
if (!blender::bke::allow_procedural_attribute_access(attribute_name)) {
|
|
|
|
|
init_socket_cpp_value_from_property(*property, socket_data_type, r_value);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2021-09-16 20:49:10 -05:00
|
|
|
auto attribute_input = std::make_shared<blender::bke::AttributeFieldInput>(
|
2021-11-22 10:18:08 +01:00
|
|
|
attribute_name, *socket_type.base_cpp_type);
|
2021-11-23 14:47:25 +01:00
|
|
|
GField attribute_field{std::move(attribute_input), 0};
|
|
|
|
|
const blender::fn::ValueOrFieldCPPType *cpp_type =
|
|
|
|
|
dynamic_cast<const blender::fn::ValueOrFieldCPPType *>(
|
|
|
|
|
socket_type.geometry_nodes_cpp_type);
|
|
|
|
|
BLI_assert(cpp_type != nullptr);
|
|
|
|
|
cpp_type->construct_from_field(r_value, std::move(attribute_field));
|
2021-09-16 20:49:10 -05:00
|
|
|
}
|
|
|
|
|
else {
|
2022-05-31 18:52:27 +02:00
|
|
|
init_socket_cpp_value_from_property(*property, socket_data_type, r_value);
|
2021-09-16 20:49:10 -05:00
|
|
|
}
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
|
2021-04-15 08:57:10 +02:00
|
|
|
static Vector<SpaceSpreadsheet *> find_spreadsheet_editors(Main *bmain)
|
2021-04-08 17:35:06 +02:00
|
|
|
{
|
2021-04-15 08:57:10 +02:00
|
|
|
wmWindowManager *wm = (wmWindowManager *)bmain->wm.first;
|
2021-05-14 13:43:30 +02:00
|
|
|
if (wm == nullptr) {
|
|
|
|
|
return {};
|
|
|
|
|
}
|
|
|
|
|
Vector<SpaceSpreadsheet *> spreadsheets;
|
2021-04-15 08:57:10 +02:00
|
|
|
LISTBASE_FOREACH (wmWindow *, window, &wm->windows) {
|
|
|
|
|
bScreen *screen = BKE_workspace_active_screen_get(window->workspace_hook);
|
|
|
|
|
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
|
|
|
|
|
SpaceLink *sl = (SpaceLink *)area->spacedata.first;
|
|
|
|
|
if (sl->spacetype == SPACE_SPREADSHEET) {
|
|
|
|
|
spreadsheets.append((SpaceSpreadsheet *)sl);
|
2021-04-08 17:35:06 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2021-04-15 08:57:10 +02:00
|
|
|
return spreadsheets;
|
2021-04-08 17:35:06 +02:00
|
|
|
}
|
|
|
|
|
|
2021-10-21 15:49:29 +02:00
|
|
|
static void find_sockets_to_preview_for_spreadsheet(SpaceSpreadsheet *sspreadsheet,
|
|
|
|
|
NodesModifierData *nmd,
|
|
|
|
|
const ModifierEvalContext *ctx,
|
|
|
|
|
const DerivedNodeTree &tree,
|
|
|
|
|
Set<DSocket> &r_sockets_to_preview)
|
2021-04-08 17:35:06 +02:00
|
|
|
{
|
2021-04-15 08:57:10 +02:00
|
|
|
Vector<SpreadsheetContext *> context_path = sspreadsheet->context_path;
|
|
|
|
|
if (context_path.size() < 3) {
|
2021-10-21 15:49:29 +02:00
|
|
|
return;
|
2021-04-15 08:57:10 +02:00
|
|
|
}
|
|
|
|
|
if (context_path[0]->type != SPREADSHEET_CONTEXT_OBJECT) {
|
2021-10-21 15:49:29 +02:00
|
|
|
return;
|
2021-04-15 08:57:10 +02:00
|
|
|
}
|
|
|
|
|
if (context_path[1]->type != SPREADSHEET_CONTEXT_MODIFIER) {
|
2021-10-21 15:49:29 +02:00
|
|
|
return;
|
2021-04-15 08:57:10 +02:00
|
|
|
}
|
|
|
|
|
SpreadsheetContextObject *object_context = (SpreadsheetContextObject *)context_path[0];
|
|
|
|
|
if (object_context->object != DEG_get_original_object(ctx->object)) {
|
2021-10-21 15:49:29 +02:00
|
|
|
return;
|
2021-04-15 08:57:10 +02:00
|
|
|
}
|
|
|
|
|
SpreadsheetContextModifier *modifier_context = (SpreadsheetContextModifier *)context_path[1];
|
|
|
|
|
if (StringRef(modifier_context->modifier_name) != nmd->modifier.name) {
|
2021-10-21 15:49:29 +02:00
|
|
|
return;
|
2021-04-15 08:57:10 +02:00
|
|
|
}
|
|
|
|
|
for (SpreadsheetContext *context : context_path.as_span().drop_front(2)) {
|
|
|
|
|
if (context->type != SPREADSHEET_CONTEXT_NODE) {
|
2021-10-21 15:49:29 +02:00
|
|
|
return;
|
2021-04-15 08:57:10 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Span<SpreadsheetContextNode *> nested_group_contexts =
|
|
|
|
|
context_path.as_span().drop_front(2).drop_back(1).cast<SpreadsheetContextNode *>();
|
|
|
|
|
SpreadsheetContextNode *last_context = (SpreadsheetContextNode *)context_path.last();
|
|
|
|
|
|
|
|
|
|
const DTreeContext *context = &tree.root_context();
|
|
|
|
|
for (SpreadsheetContextNode *node_context : nested_group_contexts) {
|
|
|
|
|
const NodeTreeRef &tree_ref = context->tree();
|
|
|
|
|
const NodeRef *found_node = nullptr;
|
|
|
|
|
for (const NodeRef *node_ref : tree_ref.nodes()) {
|
|
|
|
|
if (node_ref->name() == node_context->node_name) {
|
|
|
|
|
found_node = node_ref;
|
|
|
|
|
break;
|
2021-04-08 17:35:06 +02:00
|
|
|
}
|
2021-04-15 08:57:10 +02:00
|
|
|
}
|
|
|
|
|
if (found_node == nullptr) {
|
2021-10-21 15:49:29 +02:00
|
|
|
return;
|
2021-04-15 08:57:10 +02:00
|
|
|
}
|
|
|
|
|
context = context->child_context(*found_node);
|
|
|
|
|
if (context == nullptr) {
|
2021-10-21 15:49:29 +02:00
|
|
|
return;
|
2021-04-15 08:57:10 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const NodeTreeRef &tree_ref = context->tree();
|
2021-07-07 11:20:19 +02:00
|
|
|
for (const NodeRef *node_ref : tree_ref.nodes_by_type("GeometryNodeViewer")) {
|
2021-04-15 08:57:10 +02:00
|
|
|
if (node_ref->name() == last_context->node_name) {
|
2021-07-05 10:46:00 +02:00
|
|
|
const DNode viewer_node{context, node_ref};
|
2021-10-21 15:49:29 +02:00
|
|
|
for (const InputSocketRef *input_socket : node_ref->inputs()) {
|
|
|
|
|
if (input_socket->is_available() && input_socket->is_logically_linked()) {
|
|
|
|
|
r_sockets_to_preview.add(DSocket{context, input_socket});
|
|
|
|
|
}
|
|
|
|
|
}
|
2021-04-08 17:35:06 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-04-15 08:57:10 +02:00
|
|
|
static void find_sockets_to_preview(NodesModifierData *nmd,
|
|
|
|
|
const ModifierEvalContext *ctx,
|
|
|
|
|
const DerivedNodeTree &tree,
|
2021-07-07 11:20:19 +02:00
|
|
|
Set<DSocket> &r_sockets_to_preview)
|
2021-04-08 17:35:06 +02:00
|
|
|
{
|
2021-04-15 08:57:10 +02:00
|
|
|
Main *bmain = DEG_get_bmain(ctx->depsgraph);
|
|
|
|
|
|
|
|
|
|
/* Based on every visible spreadsheet context path, get a list of sockets that need to have their
|
|
|
|
|
* intermediate geometries cached for display. */
|
|
|
|
|
Vector<SpaceSpreadsheet *> spreadsheets = find_spreadsheet_editors(bmain);
|
|
|
|
|
for (SpaceSpreadsheet *sspreadsheet : spreadsheets) {
|
2021-10-21 15:49:29 +02:00
|
|
|
find_sockets_to_preview_for_spreadsheet(sspreadsheet, nmd, ctx, tree, r_sockets_to_preview);
|
2021-04-08 17:35:06 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-07-07 11:20:19 +02:00
|
|
|
static void clear_runtime_data(NodesModifierData *nmd)
|
2021-04-08 17:35:06 +02:00
|
|
|
{
|
2021-07-07 11:20:19 +02:00
|
|
|
if (nmd->runtime_eval_log != nullptr) {
|
|
|
|
|
delete (geo_log::ModifierLog *)nmd->runtime_eval_log;
|
|
|
|
|
nmd->runtime_eval_log = nullptr;
|
2021-04-16 11:56:04 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2022-02-02 10:54:54 +01:00
|
|
|
struct OutputAttributeInfo {
|
|
|
|
|
GField field;
|
|
|
|
|
StringRefNull name;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct OutputAttributeToStore {
|
|
|
|
|
GeometryComponentType component_type;
|
2022-06-01 14:38:06 +10:00
|
|
|
eAttrDomain domain;
|
2022-02-02 10:54:54 +01:00
|
|
|
StringRefNull name;
|
|
|
|
|
GMutableSpan data;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* The output attributes are organized based on their domain, because attributes on the same domain
|
|
|
|
|
* can be evaluated together.
|
|
|
|
|
*/
|
2022-06-01 14:38:06 +10:00
|
|
|
static MultiValueMap<eAttrDomain, OutputAttributeInfo> find_output_attributes_to_store(
|
2022-02-02 10:54:54 +01:00
|
|
|
const NodesModifierData &nmd, const NodeRef &output_node, Span<GMutablePointer> output_values)
|
2021-09-27 15:33:48 +02:00
|
|
|
{
|
2022-06-01 14:38:06 +10:00
|
|
|
MultiValueMap<eAttrDomain, OutputAttributeInfo> outputs_by_domain;
|
2022-02-02 10:54:54 +01:00
|
|
|
for (const InputSocketRef *socket : output_node.inputs().drop_front(1).drop_back(1)) {
|
|
|
|
|
if (!socket_type_has_attribute_toggle(*socket->bsocket())) {
|
|
|
|
|
continue;
|
2021-09-27 15:33:48 +02:00
|
|
|
}
|
2022-02-02 10:54:54 +01:00
|
|
|
|
|
|
|
|
const std::string prop_name = socket->identifier() + attribute_name_suffix;
|
|
|
|
|
const IDProperty *prop = IDP_GetPropertyFromGroup(nmd.settings.properties, prop_name.c_str());
|
|
|
|
|
if (prop == nullptr) {
|
|
|
|
|
continue;
|
2021-09-27 15:33:48 +02:00
|
|
|
}
|
2022-02-02 10:54:54 +01:00
|
|
|
const StringRefNull attribute_name = IDP_String(prop);
|
|
|
|
|
if (attribute_name.is_empty()) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2022-05-31 18:52:27 +02:00
|
|
|
if (!blender::bke::allow_procedural_attribute_access(attribute_name)) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2022-02-02 10:54:54 +01:00
|
|
|
|
|
|
|
|
const int index = socket->index();
|
|
|
|
|
const GPointer value = output_values[index];
|
|
|
|
|
const ValueOrFieldCPPType *cpp_type = dynamic_cast<const ValueOrFieldCPPType *>(value.type());
|
|
|
|
|
BLI_assert(cpp_type != nullptr);
|
|
|
|
|
const GField field = cpp_type->as_field(value.get());
|
|
|
|
|
|
|
|
|
|
const bNodeSocket *interface_socket = (const bNodeSocket *)BLI_findlink(
|
|
|
|
|
&nmd.node_group->outputs, socket->index());
|
2022-06-01 14:38:06 +10:00
|
|
|
const eAttrDomain domain = (eAttrDomain)interface_socket->attribute_domain;
|
2022-02-02 10:54:54 +01:00
|
|
|
OutputAttributeInfo output_info;
|
|
|
|
|
output_info.field = std::move(field);
|
|
|
|
|
output_info.name = attribute_name;
|
|
|
|
|
outputs_by_domain.add(domain, std::move(output_info));
|
2021-09-27 15:33:48 +02:00
|
|
|
}
|
2022-02-02 10:54:54 +01:00
|
|
|
return outputs_by_domain;
|
2021-09-27 15:33:48 +02:00
|
|
|
}
|
|
|
|
|
|
2022-02-02 10:54:54 +01:00
|
|
|
/**
|
|
|
|
|
* The computed values are stored in newly allocated arrays. They still have to be moved to the
|
|
|
|
|
* actual geometry.
|
|
|
|
|
*/
|
|
|
|
|
static Vector<OutputAttributeToStore> compute_attributes_to_store(
|
|
|
|
|
const GeometrySet &geometry,
|
2022-06-01 14:38:06 +10:00
|
|
|
const MultiValueMap<eAttrDomain, OutputAttributeInfo> &outputs_by_domain)
|
2021-09-27 15:33:48 +02:00
|
|
|
{
|
2022-02-02 10:54:54 +01:00
|
|
|
Vector<OutputAttributeToStore> attributes_to_store;
|
|
|
|
|
for (const GeometryComponentType component_type : {GEO_COMPONENT_TYPE_MESH,
|
|
|
|
|
GEO_COMPONENT_TYPE_POINT_CLOUD,
|
|
|
|
|
GEO_COMPONENT_TYPE_CURVE,
|
|
|
|
|
GEO_COMPONENT_TYPE_INSTANCES}) {
|
|
|
|
|
if (!geometry.has(component_type)) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
const GeometryComponent &component = *geometry.get_component_for_read(component_type);
|
|
|
|
|
for (const auto item : outputs_by_domain.items()) {
|
2022-06-01 14:38:06 +10:00
|
|
|
const eAttrDomain domain = item.key;
|
2022-02-02 10:54:54 +01:00
|
|
|
const Span<OutputAttributeInfo> outputs_info = item.value;
|
|
|
|
|
if (!component.attribute_domain_supported(domain)) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2022-05-11 12:59:58 +10:00
|
|
|
const int domain_num = component.attribute_domain_num(domain);
|
2022-02-02 10:54:54 +01:00
|
|
|
blender::bke::GeometryComponentFieldContext field_context{component, domain};
|
2022-05-11 12:59:58 +10:00
|
|
|
blender::fn::FieldEvaluator field_evaluator{field_context, domain_num};
|
2022-02-02 10:54:54 +01:00
|
|
|
for (const OutputAttributeInfo &output_info : outputs_info) {
|
|
|
|
|
const CPPType &type = output_info.field.cpp_type();
|
|
|
|
|
OutputAttributeToStore store{
|
|
|
|
|
component_type,
|
|
|
|
|
domain,
|
|
|
|
|
output_info.name,
|
2022-05-11 12:59:58 +10:00
|
|
|
GMutableSpan{type, MEM_malloc_arrayN(domain_num, type.size(), __func__), domain_num}};
|
2022-02-02 10:54:54 +01:00
|
|
|
field_evaluator.add_with_destination(output_info.field, store.data);
|
|
|
|
|
attributes_to_store.append(store);
|
|
|
|
|
}
|
|
|
|
|
field_evaluator.evaluate();
|
|
|
|
|
}
|
2021-09-27 15:33:48 +02:00
|
|
|
}
|
2022-02-02 10:54:54 +01:00
|
|
|
return attributes_to_store;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void store_computed_output_attributes(
|
|
|
|
|
GeometrySet &geometry, const Span<OutputAttributeToStore> attributes_to_store)
|
|
|
|
|
{
|
|
|
|
|
for (const OutputAttributeToStore &store : attributes_to_store) {
|
|
|
|
|
GeometryComponent &component = geometry.get_component_for_write(store.component_type);
|
2022-06-01 14:38:06 +10:00
|
|
|
const eCustomDataType data_type = blender::bke::cpp_type_to_custom_data_type(
|
|
|
|
|
store.data.type());
|
2022-02-09 15:50:03 +01:00
|
|
|
const std::optional<AttributeMetaData> meta_data = component.attribute_get_meta_data(
|
|
|
|
|
store.name);
|
2022-04-21 14:05:16 -05:00
|
|
|
|
|
|
|
|
/* Attempt to remove the attribute if it already exists but the domain and type don't match.
|
|
|
|
|
* Removing the attribute won't succeed if it is built in and non-removable. */
|
|
|
|
|
if (meta_data.has_value() &&
|
|
|
|
|
(meta_data->domain != store.domain || meta_data->data_type != data_type)) {
|
|
|
|
|
component.attribute_try_delete(store.name);
|
2022-02-02 10:54:54 +01:00
|
|
|
}
|
2022-04-21 14:05:16 -05:00
|
|
|
|
|
|
|
|
/* Try to create the attribute reusing the stored buffer. This will only succeed if the
|
|
|
|
|
* attribute didn't exist before, or if it existed but was removed above. */
|
|
|
|
|
if (component.attribute_try_create(
|
|
|
|
|
store.name,
|
|
|
|
|
store.domain,
|
|
|
|
|
blender::bke::cpp_type_to_custom_data_type(store.data.type()),
|
|
|
|
|
AttributeInitMove(store.data.data()))) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
OutputAttribute attribute = component.attribute_try_get_for_output_only(
|
|
|
|
|
store.name, store.domain, data_type);
|
|
|
|
|
if (attribute) {
|
|
|
|
|
attribute.varray().set_all(store.data.data());
|
|
|
|
|
attribute.save();
|
2022-02-02 10:54:54 +01:00
|
|
|
}
|
2022-04-21 14:05:16 -05:00
|
|
|
|
|
|
|
|
/* We were unable to reuse the data, so it must be destructed and freed. */
|
|
|
|
|
store.data.type().destruct_n(store.data.data(), store.data.size());
|
|
|
|
|
MEM_freeN(store.data.data());
|
2021-10-26 12:50:39 -05:00
|
|
|
}
|
2021-09-27 15:33:48 +02:00
|
|
|
}
|
|
|
|
|
|
2022-02-02 10:54:54 +01:00
|
|
|
static void store_output_attributes(GeometrySet &geometry,
|
|
|
|
|
const NodesModifierData &nmd,
|
|
|
|
|
const NodeRef &output_node,
|
|
|
|
|
Span<GMutablePointer> output_values)
|
|
|
|
|
{
|
|
|
|
|
/* All new attribute values have to be computed before the geometry is actually changed. This is
|
|
|
|
|
* necessary because some fields might depend on attributes that are overwritten. */
|
2022-06-01 14:38:06 +10:00
|
|
|
MultiValueMap<eAttrDomain, OutputAttributeInfo> outputs_by_domain =
|
2022-02-02 10:54:54 +01:00
|
|
|
find_output_attributes_to_store(nmd, output_node, output_values);
|
|
|
|
|
Vector<OutputAttributeToStore> attributes_to_store = compute_attributes_to_store(
|
|
|
|
|
geometry, outputs_by_domain);
|
|
|
|
|
store_computed_output_attributes(geometry, attributes_to_store);
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
/**
|
|
|
|
|
* Evaluate a node group to compute the output geometry.
|
|
|
|
|
*/
|
|
|
|
|
static GeometrySet compute_geometry(const DerivedNodeTree &tree,
|
2021-03-30 12:34:05 +02:00
|
|
|
Span<const NodeRef *> group_input_nodes,
|
2021-09-27 15:33:48 +02:00
|
|
|
const NodeRef &output_node,
|
2020-12-02 13:25:25 +01:00
|
|
|
GeometrySet input_geometry_set,
|
|
|
|
|
NodesModifierData *nmd,
|
|
|
|
|
const ModifierEvalContext *ctx)
|
|
|
|
|
{
|
2021-04-01 15:55:08 +02:00
|
|
|
blender::ResourceScope scope;
|
|
|
|
|
blender::LinearAllocator<> &allocator = scope.linear_allocator();
|
2021-10-18 11:40:00 +02:00
|
|
|
blender::nodes::NodeMultiFunctions mf_by_node{tree};
|
2020-12-02 13:25:25 +01:00
|
|
|
|
2021-03-06 16:51:06 +01:00
|
|
|
Map<DOutputSocket, GMutablePointer> group_inputs;
|
2020-12-02 13:25:25 +01:00
|
|
|
|
2021-03-06 16:51:06 +01:00
|
|
|
const DTreeContext *root_context = &tree.root_context();
|
2021-03-30 12:34:05 +02:00
|
|
|
for (const NodeRef *group_input_node : group_input_nodes) {
|
|
|
|
|
Span<const OutputSocketRef *> group_input_sockets = group_input_node->outputs().drop_back(1);
|
|
|
|
|
if (group_input_sockets.is_empty()) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2021-03-06 16:51:06 +01:00
|
|
|
Span<const OutputSocketRef *> remaining_input_sockets = group_input_sockets;
|
2020-12-02 13:25:25 +01:00
|
|
|
|
|
|
|
|
/* If the group expects a geometry as first input, use the geometry that has been passed to
|
|
|
|
|
* modifier. */
|
2021-03-06 16:51:06 +01:00
|
|
|
const OutputSocketRef *first_input_socket = group_input_sockets[0];
|
2020-12-02 13:25:25 +01:00
|
|
|
if (first_input_socket->bsocket()->type == SOCK_GEOMETRY) {
|
2021-03-07 14:24:52 +01:00
|
|
|
GeometrySet *geometry_set_in =
|
2021-03-30 12:34:05 +02:00
|
|
|
allocator.construct<GeometrySet>(input_geometry_set).release();
|
2021-03-06 16:51:06 +01:00
|
|
|
group_inputs.add_new({root_context, first_input_socket}, geometry_set_in);
|
2020-12-02 13:25:25 +01:00
|
|
|
remaining_input_sockets = remaining_input_sockets.drop_front(1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Initialize remaining group inputs. */
|
2021-03-06 16:51:06 +01:00
|
|
|
for (const OutputSocketRef *socket : remaining_input_sockets) {
|
2021-11-22 10:18:08 +01:00
|
|
|
const CPPType &cpp_type = *socket->typeinfo()->geometry_nodes_cpp_type;
|
2020-12-02 13:25:25 +01:00
|
|
|
void *value_in = allocator.allocate(cpp_type.size(), cpp_type.alignment());
|
2021-09-28 12:05:42 -05:00
|
|
|
initialize_group_input(*nmd, *socket, value_in);
|
2021-03-06 16:51:06 +01:00
|
|
|
group_inputs.add_new({root_context, socket}, {cpp_type, value_in});
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-03-06 16:51:06 +01:00
|
|
|
Vector<DInputSocket> group_outputs;
|
2021-09-27 15:33:48 +02:00
|
|
|
for (const InputSocketRef *socket_ref : output_node.inputs().drop_back(1)) {
|
|
|
|
|
group_outputs.append({root_context, socket_ref});
|
|
|
|
|
}
|
2020-12-02 13:25:25 +01:00
|
|
|
|
2021-07-07 11:20:19 +02:00
|
|
|
std::optional<geo_log::GeoLogger> geo_logger;
|
2021-04-08 17:35:06 +02:00
|
|
|
|
2021-04-27 13:03:40 +02:00
|
|
|
blender::modifiers::geometry_nodes::GeometryNodesEvaluationParams eval_params;
|
2021-07-07 11:20:19 +02:00
|
|
|
|
|
|
|
|
if (logging_enabled(ctx)) {
|
|
|
|
|
Set<DSocket> preview_sockets;
|
|
|
|
|
find_sockets_to_preview(nmd, ctx, tree, preview_sockets);
|
|
|
|
|
eval_params.force_compute_sockets.extend(preview_sockets.begin(), preview_sockets.end());
|
|
|
|
|
geo_logger.emplace(std::move(preview_sockets));
|
2021-10-21 13:54:48 -05:00
|
|
|
|
|
|
|
|
geo_logger->log_input_geometry(input_geometry_set);
|
2021-07-07 11:20:19 +02:00
|
|
|
}
|
|
|
|
|
|
2021-10-21 13:54:48 -05:00
|
|
|
/* Don't keep a reference to the input geometry components to avoid copies during evaluation. */
|
|
|
|
|
input_geometry_set.clear();
|
|
|
|
|
|
2021-04-27 13:03:40 +02:00
|
|
|
eval_params.input_values = group_inputs;
|
|
|
|
|
eval_params.output_sockets = group_outputs;
|
|
|
|
|
eval_params.mf_by_node = &mf_by_node;
|
|
|
|
|
eval_params.modifier_ = nmd;
|
|
|
|
|
eval_params.depsgraph = ctx->depsgraph;
|
2021-04-27 11:42:40 -05:00
|
|
|
eval_params.self_object = ctx->object;
|
2021-07-07 11:20:19 +02:00
|
|
|
eval_params.geo_logger = geo_logger.has_value() ? &*geo_logger : nullptr;
|
2021-04-27 13:03:40 +02:00
|
|
|
blender::modifiers::geometry_nodes::evaluate_geometry_nodes(eval_params);
|
|
|
|
|
|
2022-02-02 10:54:54 +01:00
|
|
|
GeometrySet output_geometry_set = std::move(*eval_params.r_output_values[0].get<GeometrySet>());
|
2021-10-21 13:54:48 -05:00
|
|
|
|
2021-07-07 11:20:19 +02:00
|
|
|
if (geo_logger.has_value()) {
|
2021-10-21 13:54:48 -05:00
|
|
|
geo_logger->log_output_geometry(output_geometry_set);
|
2022-02-02 12:20:03 +01:00
|
|
|
NodesModifierData *nmd_orig = (NodesModifierData *)BKE_modifier_get_original(ctx->object,
|
|
|
|
|
&nmd->modifier);
|
2021-07-07 11:20:19 +02:00
|
|
|
clear_runtime_data(nmd_orig);
|
|
|
|
|
nmd_orig->runtime_eval_log = new geo_log::ModifierLog(*geo_logger);
|
|
|
|
|
}
|
|
|
|
|
|
2022-02-02 10:54:54 +01:00
|
|
|
store_output_attributes(output_geometry_set, *nmd, output_node, eval_params.r_output_values);
|
|
|
|
|
|
|
|
|
|
for (GMutablePointer value : eval_params.r_output_values) {
|
|
|
|
|
value.destruct();
|
2021-09-27 15:33:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return output_geometry_set;
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* \note This could be done in #initialize_group_input, though that would require adding the
|
|
|
|
|
* the object as a parameter, so it's likely better to this check as a separate step.
|
|
|
|
|
*/
|
|
|
|
|
static void check_property_socket_sync(const Object *ob, ModifierData *md)
|
|
|
|
|
{
|
|
|
|
|
NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
|
|
|
|
|
|
2021-11-11 11:47:19 -06:00
|
|
|
int geometry_socket_count = 0;
|
|
|
|
|
|
|
|
|
|
int i;
|
2020-12-02 13:25:25 +01:00
|
|
|
LISTBASE_FOREACH_INDEX (const bNodeSocket *, socket, &nmd->node_group->inputs, i) {
|
|
|
|
|
/* The first socket is the special geometry socket for the modifier object. */
|
2021-11-16 14:51:03 -06:00
|
|
|
if (i == 0 && socket->type == SOCK_GEOMETRY) {
|
|
|
|
|
geometry_socket_count++;
|
|
|
|
|
continue;
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
IDProperty *property = IDP_GetPropertyFromGroup(nmd->settings.properties, socket->identifier);
|
|
|
|
|
if (property == nullptr) {
|
2021-01-13 08:13:57 -06:00
|
|
|
if (socket->type == SOCK_GEOMETRY) {
|
2021-11-11 11:47:19 -06:00
|
|
|
geometry_socket_count++;
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
BKE_modifier_set_error(ob, md, "Missing property for input socket \"%s\"", socket->name);
|
|
|
|
|
}
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
if (!id_property_type_matches_socket(*socket, *property)) {
|
2020-12-02 13:25:25 +01:00
|
|
|
BKE_modifier_set_error(
|
|
|
|
|
ob, md, "Property type does not match input socket \"(%s)\"", socket->name);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
2021-11-11 11:47:19 -06:00
|
|
|
|
2021-11-16 14:51:03 -06:00
|
|
|
if (geometry_socket_count == 1) {
|
|
|
|
|
if (((bNodeSocket *)nmd->node_group->inputs.first)->type != SOCK_GEOMETRY) {
|
|
|
|
|
BKE_modifier_set_error(ob, md, "Node group's geometry input must be the first");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (geometry_socket_count > 1) {
|
2021-11-11 11:47:19 -06:00
|
|
|
BKE_modifier_set_error(ob, md, "Node group can only have one geometry input");
|
|
|
|
|
}
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void modifyGeometry(ModifierData *md,
|
|
|
|
|
const ModifierEvalContext *ctx,
|
|
|
|
|
GeometrySet &geometry_set)
|
|
|
|
|
{
|
|
|
|
|
NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
|
|
|
|
|
if (nmd->node_group == nullptr) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
check_property_socket_sync(ctx->object, md);
|
|
|
|
|
|
2021-03-06 16:51:06 +01:00
|
|
|
NodeTreeRefMap tree_refs;
|
|
|
|
|
DerivedNodeTree tree{*nmd->node_group, tree_refs};
|
2020-12-02 13:25:25 +01:00
|
|
|
|
|
|
|
|
if (tree.has_link_cycles()) {
|
|
|
|
|
BKE_modifier_set_error(ctx->object, md, "Node group has cycles");
|
2021-11-10 10:52:07 -06:00
|
|
|
geometry_set.clear();
|
2020-12-02 13:25:25 +01:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2021-03-06 16:51:06 +01:00
|
|
|
const NodeTreeRef &root_tree_ref = tree.root_context().tree();
|
|
|
|
|
Span<const NodeRef *> input_nodes = root_tree_ref.nodes_by_type("NodeGroupInput");
|
|
|
|
|
Span<const NodeRef *> output_nodes = root_tree_ref.nodes_by_type("NodeGroupOutput");
|
2020-12-02 13:25:25 +01:00
|
|
|
if (output_nodes.size() != 1) {
|
2021-11-10 10:52:07 -06:00
|
|
|
BKE_modifier_set_error(ctx->object, md, "Node group must have a single output node");
|
|
|
|
|
geometry_set.clear();
|
2020-12-02 13:25:25 +01:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2021-09-27 15:33:48 +02:00
|
|
|
const NodeRef &output_node = *output_nodes[0];
|
|
|
|
|
Span<const InputSocketRef *> group_outputs = output_node.inputs().drop_back(1);
|
|
|
|
|
if (group_outputs.is_empty()) {
|
2021-11-10 10:52:07 -06:00
|
|
|
BKE_modifier_set_error(ctx->object, md, "Node group must have an output socket");
|
|
|
|
|
geometry_set.clear();
|
2020-12-02 13:25:25 +01:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2021-09-27 15:33:48 +02:00
|
|
|
const InputSocketRef *first_output_socket = group_outputs[0];
|
|
|
|
|
if (first_output_socket->idname() != "NodeSocketGeometry") {
|
2021-11-10 10:52:07 -06:00
|
|
|
BKE_modifier_set_error(ctx->object, md, "Node group's first output must be a geometry");
|
|
|
|
|
geometry_set.clear();
|
2020-12-02 13:25:25 +01:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2022-03-02 16:10:42 +01:00
|
|
|
bool use_orig_index_verts = false;
|
|
|
|
|
bool use_orig_index_edges = false;
|
|
|
|
|
bool use_orig_index_polys = false;
|
|
|
|
|
if (geometry_set.has_mesh()) {
|
|
|
|
|
const Mesh &mesh = *geometry_set.get_mesh_for_read();
|
|
|
|
|
use_orig_index_verts = CustomData_has_layer(&mesh.vdata, CD_ORIGINDEX);
|
|
|
|
|
use_orig_index_edges = CustomData_has_layer(&mesh.edata, CD_ORIGINDEX);
|
|
|
|
|
use_orig_index_polys = CustomData_has_layer(&mesh.pdata, CD_ORIGINDEX);
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
geometry_set = compute_geometry(
|
2021-09-27 15:33:48 +02:00
|
|
|
tree, input_nodes, output_node, std::move(geometry_set), nmd, ctx);
|
2022-03-02 16:10:42 +01:00
|
|
|
|
|
|
|
|
if (geometry_set.has_mesh()) {
|
|
|
|
|
/* Add #CD_ORIGINDEX layers if they don't exist already. This is required because the
|
|
|
|
|
* #eModifierTypeFlag_SupportsMapping flag is set. If the layers did not exist before, it is
|
|
|
|
|
* assumed that the output mesh does not have a mapping to the original mesh. */
|
|
|
|
|
Mesh &mesh = *geometry_set.get_mesh_for_write();
|
|
|
|
|
if (use_orig_index_verts) {
|
|
|
|
|
CustomData_add_layer(&mesh.vdata, CD_ORIGINDEX, CD_DEFAULT, nullptr, mesh.totvert);
|
|
|
|
|
}
|
|
|
|
|
if (use_orig_index_edges) {
|
|
|
|
|
CustomData_add_layer(&mesh.edata, CD_ORIGINDEX, CD_DEFAULT, nullptr, mesh.totedge);
|
|
|
|
|
}
|
|
|
|
|
if (use_orig_index_polys) {
|
|
|
|
|
CustomData_add_layer(&mesh.pdata, CD_ORIGINDEX, CD_DEFAULT, nullptr, mesh.totpoly);
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh)
|
|
|
|
|
{
|
|
|
|
|
GeometrySet geometry_set = GeometrySet::create_with_mesh(mesh, GeometryOwnershipType::Editable);
|
2021-07-13 12:10:34 -04:00
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
modifyGeometry(md, ctx, geometry_set);
|
2021-04-14 14:23:48 -05:00
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
Mesh *new_mesh = geometry_set.get_component_for_write<MeshComponent>().release();
|
|
|
|
|
if (new_mesh == nullptr) {
|
|
|
|
|
return BKE_mesh_new_nomain(0, 0, 0, 0, 0);
|
|
|
|
|
}
|
|
|
|
|
return new_mesh;
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-10 14:35:02 +01:00
|
|
|
static void modifyGeometrySet(ModifierData *md,
|
|
|
|
|
const ModifierEvalContext *ctx,
|
|
|
|
|
GeometrySet *geometry_set)
|
2020-12-02 13:25:25 +01:00
|
|
|
{
|
|
|
|
|
modifyGeometry(md, ctx, *geometry_set);
|
|
|
|
|
}
|
|
|
|
|
|
2021-10-21 13:54:48 -05:00
|
|
|
struct AttributeSearchData {
|
2021-11-05 11:19:12 -05:00
|
|
|
uint32_t object_session_uid;
|
|
|
|
|
char modifier_name[MAX_NAME];
|
|
|
|
|
char socket_identifier[MAX_NAME];
|
2021-10-21 13:54:48 -05:00
|
|
|
bool is_output;
|
|
|
|
|
};
|
|
|
|
|
/* This class must not have a destructor, since it is used by buttons and freed with #MEM_freeN. */
|
|
|
|
|
BLI_STATIC_ASSERT(std::is_trivially_destructible_v<AttributeSearchData>, "");
|
|
|
|
|
|
2021-11-10 15:43:18 -06:00
|
|
|
static NodesModifierData *get_modifier_data(Main &bmain,
|
|
|
|
|
const wmWindowManager &wm,
|
|
|
|
|
const AttributeSearchData &data)
|
2021-10-21 13:54:48 -05:00
|
|
|
{
|
2021-11-10 15:43:18 -06:00
|
|
|
if (ED_screen_animation_playing(&wm)) {
|
|
|
|
|
/* Work around an issue where the attribute search exec function has stale pointers when data
|
|
|
|
|
* is reallocated when evaluating the node tree, causing a crash. This would be solved by
|
|
|
|
|
* allowing the UI search data to own arbitrary memory rather than just referencing it. */
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
2021-11-05 11:19:12 -05:00
|
|
|
const Object *object = (Object *)BKE_libblock_find_session_uuid(
|
|
|
|
|
&bmain, ID_OB, data.object_session_uid);
|
|
|
|
|
if (object == nullptr) {
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
ModifierData *md = BKE_modifiers_findby_name(object, data.modifier_name);
|
|
|
|
|
if (md == nullptr) {
|
|
|
|
|
return nullptr;
|
|
|
|
|
}
|
|
|
|
|
BLI_assert(md->type == eModifierType_Nodes);
|
|
|
|
|
return reinterpret_cast<NodesModifierData *>(md);
|
|
|
|
|
}
|
2021-10-21 13:54:48 -05:00
|
|
|
|
2021-11-05 11:19:12 -05:00
|
|
|
static void attribute_search_update_fn(
|
|
|
|
|
const bContext *C, void *arg, const char *str, uiSearchItems *items, const bool is_first)
|
|
|
|
|
{
|
|
|
|
|
AttributeSearchData &data = *static_cast<AttributeSearchData *>(arg);
|
2021-11-10 15:43:18 -06:00
|
|
|
const NodesModifierData *nmd = get_modifier_data(*CTX_data_main(C), *CTX_wm_manager(C), data);
|
2021-11-05 11:19:12 -05:00
|
|
|
if (nmd == nullptr) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
const geo_log::ModifierLog *modifier_log = static_cast<const geo_log::ModifierLog *>(
|
|
|
|
|
nmd->runtime_eval_log);
|
|
|
|
|
if (modifier_log == nullptr) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
const geo_log::GeometryValueLog *geometry_log = data.is_output ?
|
|
|
|
|
modifier_log->output_geometry_log() :
|
|
|
|
|
modifier_log->input_geometry_log();
|
2021-10-21 13:54:48 -05:00
|
|
|
if (geometry_log == nullptr) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Span<GeometryAttributeInfo> infos = geometry_log->attributes();
|
|
|
|
|
|
|
|
|
|
/* The shared attribute search code expects a span of pointers, so convert to that. */
|
|
|
|
|
Array<const GeometryAttributeInfo *> info_ptrs(infos.size());
|
|
|
|
|
for (const int i : infos.index_range()) {
|
|
|
|
|
info_ptrs[i] = &infos[i];
|
|
|
|
|
}
|
|
|
|
|
blender::ui::attribute_search_add_items(
|
2021-11-05 11:19:12 -05:00
|
|
|
str, data.is_output, info_ptrs.as_span(), items, is_first);
|
2021-10-21 13:54:48 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void attribute_search_exec_fn(bContext *C, void *data_v, void *item_v)
|
|
|
|
|
{
|
|
|
|
|
if (item_v == nullptr) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
AttributeSearchData &data = *static_cast<AttributeSearchData *>(data_v);
|
|
|
|
|
const GeometryAttributeInfo &item = *static_cast<const GeometryAttributeInfo *>(item_v);
|
2021-11-10 15:43:18 -06:00
|
|
|
const NodesModifierData *nmd = get_modifier_data(*CTX_data_main(C), *CTX_wm_manager(C), data);
|
2021-11-05 11:19:12 -05:00
|
|
|
if (nmd == nullptr) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
2021-10-21 13:54:48 -05:00
|
|
|
|
2021-11-05 11:19:12 -05:00
|
|
|
const std::string attribute_prop_name = data.socket_identifier + attribute_name_suffix;
|
|
|
|
|
IDProperty &name_property = *IDP_GetPropertyFromGroup(nmd->settings.properties,
|
|
|
|
|
attribute_prop_name.c_str());
|
2021-10-21 13:54:48 -05:00
|
|
|
IDP_AssignString(&name_property, item.name.c_str(), 0);
|
|
|
|
|
|
|
|
|
|
ED_undo_push(C, "Assign Attribute Name");
|
|
|
|
|
}
|
|
|
|
|
|
2021-11-05 11:19:12 -05:00
|
|
|
static void add_attribute_search_button(const bContext &C,
|
|
|
|
|
uiLayout *layout,
|
2021-10-21 13:54:48 -05:00
|
|
|
const NodesModifierData &nmd,
|
|
|
|
|
PointerRNA *md_ptr,
|
|
|
|
|
const StringRefNull rna_path_attribute_name,
|
|
|
|
|
const bNodeSocket &socket,
|
|
|
|
|
const bool is_output)
|
|
|
|
|
{
|
|
|
|
|
const geo_log::ModifierLog *log = static_cast<geo_log::ModifierLog *>(nmd.runtime_eval_log);
|
|
|
|
|
if (log == nullptr) {
|
|
|
|
|
uiItemR(layout, md_ptr, rna_path_attribute_name.c_str(), 0, "", ICON_NONE);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uiBlock *block = uiLayoutGetBlock(layout);
|
|
|
|
|
uiBut *but = uiDefIconTextButR(block,
|
|
|
|
|
UI_BTYPE_SEARCH_MENU,
|
|
|
|
|
0,
|
|
|
|
|
ICON_NONE,
|
|
|
|
|
"",
|
|
|
|
|
0,
|
|
|
|
|
0,
|
|
|
|
|
10 * UI_UNIT_X, /* Dummy value, replaced by layout system. */
|
|
|
|
|
UI_UNIT_Y,
|
|
|
|
|
md_ptr,
|
|
|
|
|
rna_path_attribute_name.c_str(),
|
|
|
|
|
0,
|
|
|
|
|
0.0f,
|
|
|
|
|
0.0f,
|
|
|
|
|
0.0f,
|
|
|
|
|
0.0f,
|
2022-02-17 23:44:16 -06:00
|
|
|
socket.description);
|
2021-10-21 13:54:48 -05:00
|
|
|
|
2021-11-05 11:19:12 -05:00
|
|
|
const Object *object = ED_object_context(&C);
|
|
|
|
|
BLI_assert(object != nullptr);
|
|
|
|
|
if (object == nullptr) {
|
2021-10-21 13:54:48 -05:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2021-12-17 15:38:15 +01:00
|
|
|
AttributeSearchData *data = MEM_new<AttributeSearchData>(__func__);
|
2021-11-05 11:19:12 -05:00
|
|
|
data->object_session_uid = object->id.session_uuid;
|
|
|
|
|
STRNCPY(data->modifier_name, nmd.modifier.name);
|
|
|
|
|
STRNCPY(data->socket_identifier, socket.identifier);
|
|
|
|
|
data->is_output = is_output;
|
2021-10-21 13:54:48 -05:00
|
|
|
|
|
|
|
|
UI_but_func_search_set_results_are_suggestions(but, true);
|
|
|
|
|
UI_but_func_search_set_sep_string(but, UI_MENU_ARROW_SEP);
|
|
|
|
|
UI_but_func_search_set(but,
|
|
|
|
|
nullptr,
|
|
|
|
|
attribute_search_update_fn,
|
|
|
|
|
static_cast<void *>(data),
|
|
|
|
|
true,
|
|
|
|
|
nullptr,
|
|
|
|
|
attribute_search_exec_fn,
|
|
|
|
|
nullptr);
|
2022-05-31 18:52:27 +02:00
|
|
|
|
|
|
|
|
char *attribute_name = RNA_string_get_alloc(
|
|
|
|
|
md_ptr, rna_path_attribute_name.c_str(), nullptr, 0, nullptr);
|
|
|
|
|
const bool access_allowed = blender::bke::allow_procedural_attribute_access(attribute_name);
|
|
|
|
|
MEM_freeN(attribute_name);
|
|
|
|
|
if (!access_allowed) {
|
|
|
|
|
UI_but_flag_enable(but, UI_BUT_REDALERT);
|
|
|
|
|
}
|
2021-10-21 13:54:48 -05:00
|
|
|
}
|
|
|
|
|
|
2021-11-05 11:19:12 -05:00
|
|
|
static void add_attribute_search_or_value_buttons(const bContext &C,
|
|
|
|
|
uiLayout *layout,
|
2021-10-21 13:54:48 -05:00
|
|
|
const NodesModifierData &nmd,
|
|
|
|
|
PointerRNA *md_ptr,
|
|
|
|
|
const bNodeSocket &socket)
|
|
|
|
|
{
|
|
|
|
|
char socket_id_esc[sizeof(socket.identifier) * 2];
|
|
|
|
|
BLI_str_escape(socket_id_esc, socket.identifier, sizeof(socket_id_esc));
|
|
|
|
|
const std::string rna_path = "[\"" + std::string(socket_id_esc) + "\"]";
|
|
|
|
|
const std::string rna_path_use_attribute = "[\"" + std::string(socket_id_esc) +
|
|
|
|
|
use_attribute_suffix + "\"]";
|
|
|
|
|
const std::string rna_path_attribute_name = "[\"" + std::string(socket_id_esc) +
|
|
|
|
|
attribute_name_suffix + "\"]";
|
|
|
|
|
|
|
|
|
|
uiLayout *split = uiLayoutSplit(layout, 0.4f, false);
|
|
|
|
|
uiLayout *name_row = uiLayoutRow(split, false);
|
|
|
|
|
uiLayoutSetAlignment(name_row, UI_LAYOUT_ALIGN_RIGHT);
|
|
|
|
|
uiItemL(name_row, socket.name, ICON_NONE);
|
|
|
|
|
|
|
|
|
|
uiLayout *row = uiLayoutRow(split, true);
|
|
|
|
|
|
|
|
|
|
PointerRNA props;
|
|
|
|
|
uiItemFullO(row,
|
|
|
|
|
"object.geometry_nodes_input_attribute_toggle",
|
|
|
|
|
"",
|
|
|
|
|
ICON_SPREADSHEET,
|
|
|
|
|
nullptr,
|
|
|
|
|
WM_OP_INVOKE_DEFAULT,
|
|
|
|
|
0,
|
|
|
|
|
&props);
|
|
|
|
|
RNA_string_set(&props, "modifier_name", nmd.modifier.name);
|
|
|
|
|
RNA_string_set(&props, "prop_path", rna_path_use_attribute.c_str());
|
|
|
|
|
|
|
|
|
|
const int use_attribute = RNA_int_get(md_ptr, rna_path_use_attribute.c_str()) != 0;
|
|
|
|
|
if (use_attribute) {
|
2021-11-05 11:19:12 -05:00
|
|
|
add_attribute_search_button(C, row, nmd, md_ptr, rna_path_attribute_name, socket, false);
|
2021-10-21 13:54:48 -05:00
|
|
|
uiItemL(row, "", ICON_BLANK1);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
uiItemR(row, md_ptr, rna_path.c_str(), 0, "", ICON_NONE);
|
2022-04-28 13:46:42 -05:00
|
|
|
uiItemDecoratorR(row, md_ptr, rna_path.c_str(), -1);
|
2021-10-21 13:54:48 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
/* Drawing the properties manually with #uiItemR instead of #uiDefAutoButsRNA allows using
|
|
|
|
|
* the node socket identifier for the property names, since they are unique, but also having
|
2021-06-24 15:56:58 +10:00
|
|
|
* the correct label displayed in the UI. */
|
2021-11-05 11:19:12 -05:00
|
|
|
static void draw_property_for_socket(const bContext &C,
|
|
|
|
|
uiLayout *layout,
|
2021-09-28 12:05:42 -05:00
|
|
|
NodesModifierData *nmd,
|
|
|
|
|
PointerRNA *bmain_ptr,
|
|
|
|
|
PointerRNA *md_ptr,
|
|
|
|
|
const bNodeSocket &socket,
|
|
|
|
|
const int socket_index)
|
2020-12-02 13:25:25 +01:00
|
|
|
{
|
|
|
|
|
/* The property should be created in #MOD_nodes_update_interface with the correct type. */
|
2021-09-16 20:49:10 -05:00
|
|
|
IDProperty *property = IDP_GetPropertyFromGroup(nmd->settings.properties, socket.identifier);
|
2020-12-02 13:25:25 +01:00
|
|
|
|
|
|
|
|
/* IDProperties can be removed with python, so there could be a situation where
|
|
|
|
|
* there isn't a property for a socket or it doesn't have the correct type. */
|
Refactor IDProperty UI data storage
The storage of IDProperty UI data (min, max, default value, etc) is
quite complicated. For every property, retrieving a single one of these
values involves three string lookups. First for the "_RNA_UI" group
property, then another for a group with the property's name, then for
the data value name. Not only is this inefficient, it's hard to reason
about, unintuitive, and not at all self-explanatory.
This commit replaces that system with a UI data struct directly in the
IDProperty. If it's not used, the only cost is of a NULL pointer. Beyond
storing the description, name, and RNA subtype, derived structs are used
to store type specific UI data like min and max.
Note that this means that addons using (abusing) the `_RNA_UI` custom
property will have to be changed. A few places in the addons repository
will be changed after this commit with D9919.
**Before**
Before, first the _RNA_UI subgroup is retrieved the _RNA_UI group,
then the subgroup for the original property, then specific UI data
is accessed like any other IDProperty.
```
prop = rna_idprop_ui_prop_get(idproperties_owner, "prop_name", create=True)
prop["min"] = 1.0
```
**After**
After, the `id_properties_ui` function for RNA structs returns a python
object specifically for managing an IDProperty's UI data.
```
ui_data = idproperties_owner.id_properties_ui("prop_name")
ui_data.update(min=1.0)
```
In addition to `update`, there are now other functions:
- `as_dict`: Returns a dictionary of the property's UI data.
- `clear`: Removes the property's UI data.
- `update_from`: Copy UI data between properties,
even if they have different owners.
Differential Revision: https://developer.blender.org/D9697
2021-08-27 08:27:24 -05:00
|
|
|
if (property == nullptr || !id_property_type_matches_socket(socket, *property)) {
|
2021-04-29 10:46:55 -05:00
|
|
|
return;
|
|
|
|
|
}
|
2020-12-14 18:44:04 +11:00
|
|
|
|
2021-04-29 10:46:55 -05:00
|
|
|
char socket_id_esc[sizeof(socket.identifier) * 2];
|
|
|
|
|
BLI_str_escape(socket_id_esc, socket.identifier, sizeof(socket_id_esc));
|
2020-12-14 18:44:04 +11:00
|
|
|
|
2021-04-29 10:46:55 -05:00
|
|
|
char rna_path[sizeof(socket_id_esc) + 4];
|
|
|
|
|
BLI_snprintf(rna_path, ARRAY_SIZE(rna_path), "[\"%s\"]", socket_id_esc);
|
2021-01-13 08:13:57 -06:00
|
|
|
|
2021-04-29 10:46:55 -05:00
|
|
|
/* Use #uiItemPointerR to draw pointer properties because #uiItemR would not have enough
|
|
|
|
|
* information about what type of ID to select for editing the values. This is because
|
|
|
|
|
* pointer IDProperties contain no information about their type. */
|
|
|
|
|
switch (socket.type) {
|
|
|
|
|
case SOCK_OBJECT: {
|
|
|
|
|
uiItemPointerR(
|
|
|
|
|
layout, md_ptr, rna_path, bmain_ptr, "objects", socket.name, ICON_OBJECT_DATA);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case SOCK_COLLECTION: {
|
|
|
|
|
uiItemPointerR(layout,
|
|
|
|
|
md_ptr,
|
|
|
|
|
rna_path,
|
|
|
|
|
bmain_ptr,
|
|
|
|
|
"collections",
|
|
|
|
|
socket.name,
|
|
|
|
|
ICON_OUTLINER_COLLECTION);
|
|
|
|
|
break;
|
2021-01-13 08:13:57 -06:00
|
|
|
}
|
2021-05-27 11:06:08 -04:00
|
|
|
case SOCK_MATERIAL: {
|
|
|
|
|
uiItemPointerR(layout, md_ptr, rna_path, bmain_ptr, "materials", socket.name, ICON_MATERIAL);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case SOCK_TEXTURE: {
|
|
|
|
|
uiItemPointerR(layout, md_ptr, rna_path, bmain_ptr, "textures", socket.name, ICON_TEXTURE);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2021-10-14 14:18:24 +01:00
|
|
|
case SOCK_IMAGE: {
|
|
|
|
|
uiItemPointerR(layout, md_ptr, rna_path, bmain_ptr, "images", socket.name, ICON_IMAGE);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2021-09-16 20:49:10 -05:00
|
|
|
default: {
|
2021-09-28 13:22:52 -05:00
|
|
|
if (input_has_attribute_toggle(*nmd->node_group, socket_index)) {
|
2021-11-05 11:19:12 -05:00
|
|
|
add_attribute_search_or_value_buttons(C, layout, *nmd, md_ptr, socket);
|
2021-09-16 20:49:10 -05:00
|
|
|
}
|
|
|
|
|
else {
|
2021-10-21 13:54:48 -05:00
|
|
|
uiLayout *row = uiLayoutRow(layout, false);
|
2021-11-09 14:16:20 +01:00
|
|
|
uiLayoutSetPropDecorate(row, true);
|
2021-10-21 13:54:48 -05:00
|
|
|
uiItemR(row, md_ptr, rna_path, 0, socket.name, ICON_NONE);
|
2021-09-16 20:49:10 -05:00
|
|
|
}
|
|
|
|
|
}
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-11-05 11:19:12 -05:00
|
|
|
static void draw_property_for_output_socket(const bContext &C,
|
|
|
|
|
uiLayout *layout,
|
2021-10-21 13:54:48 -05:00
|
|
|
const NodesModifierData &nmd,
|
2021-09-27 15:33:48 +02:00
|
|
|
PointerRNA *md_ptr,
|
|
|
|
|
const bNodeSocket &socket)
|
|
|
|
|
{
|
|
|
|
|
char socket_id_esc[sizeof(socket.identifier) * 2];
|
|
|
|
|
BLI_str_escape(socket_id_esc, socket.identifier, sizeof(socket_id_esc));
|
|
|
|
|
const std::string rna_path_attribute_name = "[\"" + StringRef(socket_id_esc) +
|
|
|
|
|
attribute_name_suffix + "\"]";
|
|
|
|
|
|
2021-10-21 13:54:48 -05:00
|
|
|
uiLayout *split = uiLayoutSplit(layout, 0.4f, false);
|
|
|
|
|
uiLayout *name_row = uiLayoutRow(split, false);
|
|
|
|
|
uiLayoutSetAlignment(name_row, UI_LAYOUT_ALIGN_RIGHT);
|
|
|
|
|
uiItemL(name_row, socket.name, ICON_NONE);
|
|
|
|
|
|
|
|
|
|
uiLayout *row = uiLayoutRow(split, true);
|
2021-11-05 11:19:12 -05:00
|
|
|
add_attribute_search_button(C, row, nmd, md_ptr, rna_path_attribute_name, socket, true);
|
2021-09-27 15:33:48 +02:00
|
|
|
}
|
|
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
static void panel_draw(const bContext *C, Panel *panel)
|
|
|
|
|
{
|
|
|
|
|
uiLayout *layout = panel->layout;
|
2021-01-13 08:13:57 -06:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2020-12-02 13:25:25 +01:00
|
|
|
|
|
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, nullptr);
|
|
|
|
|
NodesModifierData *nmd = static_cast<NodesModifierData *>(ptr->data);
|
|
|
|
|
|
|
|
|
|
uiLayoutSetPropSep(layout, true);
|
2021-10-21 13:54:48 -05:00
|
|
|
/* Decorators are added manually for supported properties because the
|
|
|
|
|
* attribute/value toggle requires a manually built layout anyway. */
|
|
|
|
|
uiLayoutSetPropDecorate(layout, false);
|
2020-12-02 13:25:25 +01:00
|
|
|
|
|
|
|
|
uiTemplateID(layout,
|
|
|
|
|
C,
|
|
|
|
|
ptr,
|
|
|
|
|
"node_group",
|
|
|
|
|
"node.new_geometry_node_group_assign",
|
|
|
|
|
nullptr,
|
|
|
|
|
nullptr,
|
|
|
|
|
0,
|
|
|
|
|
false,
|
|
|
|
|
nullptr);
|
|
|
|
|
|
|
|
|
|
if (nmd->node_group != nullptr && nmd->settings.properties != nullptr) {
|
2021-01-13 08:13:57 -06:00
|
|
|
PointerRNA bmain_ptr;
|
|
|
|
|
RNA_main_pointer_create(bmain, &bmain_ptr);
|
|
|
|
|
|
2021-09-28 12:05:42 -05:00
|
|
|
int socket_index;
|
|
|
|
|
LISTBASE_FOREACH_INDEX (bNodeSocket *, socket, &nmd->node_group->inputs, socket_index) {
|
2021-11-05 11:19:12 -05:00
|
|
|
draw_property_for_socket(*C, layout, nmd, &bmain_ptr, ptr, *socket, socket_index);
|
2021-09-27 15:33:48 +02:00
|
|
|
}
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
|
2021-07-22 17:53:35 -04:00
|
|
|
/* Draw node warnings. */
|
|
|
|
|
if (nmd->runtime_eval_log != nullptr) {
|
|
|
|
|
const geo_log::ModifierLog &log = *static_cast<geo_log::ModifierLog *>(nmd->runtime_eval_log);
|
2021-09-21 17:17:40 -05:00
|
|
|
log.foreach_node_log([&](const geo_log::NodeLog &node_log) {
|
2021-07-22 17:53:35 -04:00
|
|
|
for (const geo_log::NodeWarning &warning : node_log.warnings()) {
|
2022-03-16 08:51:11 -05:00
|
|
|
if (warning.type != geo_log::NodeWarningType::Info) {
|
2021-07-22 17:53:35 -04:00
|
|
|
uiItemL(layout, warning.message.c_str(), ICON_ERROR);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
modifier_panel_end(layout, ptr);
|
|
|
|
|
}
|
|
|
|
|
|
2021-11-05 11:19:12 -05:00
|
|
|
static void output_attribute_panel_draw(const bContext *C, Panel *panel)
|
2021-09-27 13:04:58 -05:00
|
|
|
{
|
|
|
|
|
uiLayout *layout = panel->layout;
|
|
|
|
|
|
|
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, nullptr);
|
|
|
|
|
NodesModifierData *nmd = static_cast<NodesModifierData *>(ptr->data);
|
|
|
|
|
|
|
|
|
|
uiLayoutSetPropSep(layout, true);
|
|
|
|
|
uiLayoutSetPropDecorate(layout, true);
|
|
|
|
|
|
2021-10-27 08:54:24 -05:00
|
|
|
bool has_output_attribute = false;
|
2021-09-27 13:04:58 -05:00
|
|
|
if (nmd->node_group != nullptr && nmd->settings.properties != nullptr) {
|
|
|
|
|
LISTBASE_FOREACH (bNodeSocket *, socket, &nmd->node_group->outputs) {
|
|
|
|
|
if (socket_type_has_attribute_toggle(*socket)) {
|
2021-10-27 08:54:24 -05:00
|
|
|
has_output_attribute = true;
|
2021-11-05 11:19:12 -05:00
|
|
|
draw_property_for_output_socket(*C, layout, *nmd, ptr, *socket);
|
2021-09-27 13:04:58 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2021-10-27 08:54:24 -05:00
|
|
|
if (!has_output_attribute) {
|
2021-11-02 17:20:24 +01:00
|
|
|
uiItemL(layout, TIP_("No group output attributes connected"), ICON_INFO);
|
2021-10-27 08:54:24 -05:00
|
|
|
}
|
2021-09-27 13:04:58 -05:00
|
|
|
}
|
|
|
|
|
|
2022-04-26 16:58:53 +02:00
|
|
|
static void internal_dependencies_panel_draw(const bContext *UNUSED(C), Panel *panel)
|
2022-04-21 15:10:07 +02:00
|
|
|
{
|
|
|
|
|
uiLayout *layout = panel->layout;
|
|
|
|
|
|
|
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, nullptr);
|
|
|
|
|
NodesModifierData *nmd = static_cast<NodesModifierData *>(ptr->data);
|
|
|
|
|
|
|
|
|
|
if (nmd->runtime_eval_log == nullptr) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
const geo_log::ModifierLog &log = *static_cast<geo_log::ModifierLog *>(nmd->runtime_eval_log);
|
2022-06-01 14:38:06 +10:00
|
|
|
Map<std::string, eNamedAttrUsage> usage_by_attribute;
|
2022-04-21 15:10:07 +02:00
|
|
|
log.foreach_node_log([&](const geo_log::NodeLog &node_log) {
|
|
|
|
|
for (const geo_log::UsedNamedAttribute &used_attribute : node_log.used_named_attributes()) {
|
|
|
|
|
usage_by_attribute.lookup_or_add_as(used_attribute.name,
|
|
|
|
|
used_attribute.usage) |= used_attribute.usage;
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
if (usage_by_attribute.is_empty()) {
|
|
|
|
|
uiItemL(layout, IFACE_("No named attributes used"), ICON_INFO);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2022-04-25 16:00:43 +02:00
|
|
|
struct NameWithUsage {
|
|
|
|
|
StringRefNull name;
|
2022-06-01 14:38:06 +10:00
|
|
|
eNamedAttrUsage usage;
|
2022-04-25 16:00:43 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
Vector<NameWithUsage> sorted_used_attribute;
|
2022-04-21 15:10:07 +02:00
|
|
|
for (auto &&item : usage_by_attribute.items()) {
|
|
|
|
|
sorted_used_attribute.append({item.key, item.value});
|
|
|
|
|
}
|
2022-04-25 16:00:43 +02:00
|
|
|
std::sort(sorted_used_attribute.begin(),
|
|
|
|
|
sorted_used_attribute.end(),
|
|
|
|
|
[](const NameWithUsage &a, const NameWithUsage &b) {
|
|
|
|
|
return BLI_strcasecmp_natural(a.name.c_str(), b.name.c_str()) <= 0;
|
|
|
|
|
});
|
2022-04-21 15:10:07 +02:00
|
|
|
|
2022-04-25 16:00:43 +02:00
|
|
|
for (const NameWithUsage &attribute : sorted_used_attribute) {
|
|
|
|
|
const StringRefNull attribute_name = attribute.name;
|
2022-06-01 14:38:06 +10:00
|
|
|
const eNamedAttrUsage usage = attribute.usage;
|
2022-04-21 15:10:07 +02:00
|
|
|
|
|
|
|
|
/* #uiLayoutRowWithHeading doesn't seem to work in this case. */
|
|
|
|
|
uiLayout *split = uiLayoutSplit(layout, 0.4f, false);
|
|
|
|
|
|
|
|
|
|
std::stringstream ss;
|
|
|
|
|
Vector<std::string> usages;
|
2022-06-01 14:38:06 +10:00
|
|
|
if ((usage & eNamedAttrUsage::Read) != eNamedAttrUsage::None) {
|
2022-04-21 15:10:07 +02:00
|
|
|
usages.append(TIP_("Read"));
|
|
|
|
|
}
|
2022-06-01 14:38:06 +10:00
|
|
|
if ((usage & eNamedAttrUsage::Write) != eNamedAttrUsage::None) {
|
2022-04-21 15:10:07 +02:00
|
|
|
usages.append(TIP_("Write"));
|
|
|
|
|
}
|
2022-06-01 14:38:06 +10:00
|
|
|
if ((usage & eNamedAttrUsage::Remove) != eNamedAttrUsage::None) {
|
2022-04-21 15:10:07 +02:00
|
|
|
usages.append(TIP_("Remove"));
|
|
|
|
|
}
|
|
|
|
|
for (const int i : usages.index_range()) {
|
|
|
|
|
ss << usages[i];
|
|
|
|
|
if (i < usages.size() - 1) {
|
|
|
|
|
ss << ", ";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uiLayout *row = uiLayoutRow(split, false);
|
|
|
|
|
uiLayoutSetAlignment(row, UI_LAYOUT_ALIGN_RIGHT);
|
|
|
|
|
uiLayoutSetActive(row, false);
|
|
|
|
|
uiItemL(row, ss.str().c_str(), ICON_NONE);
|
|
|
|
|
|
|
|
|
|
row = uiLayoutRow(split, false);
|
|
|
|
|
uiItemL(row, attribute_name.c_str(), ICON_NONE);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
static void panelRegister(ARegionType *region_type)
|
|
|
|
|
{
|
2021-09-27 13:04:58 -05:00
|
|
|
PanelType *panel_type = modifier_panel_register(region_type, eModifierType_Nodes, panel_draw);
|
|
|
|
|
modifier_subpanel_register(region_type,
|
|
|
|
|
"output_attributes",
|
|
|
|
|
N_("Output Attributes"),
|
|
|
|
|
nullptr,
|
|
|
|
|
output_attribute_panel_draw,
|
|
|
|
|
panel_type);
|
2022-04-21 15:10:07 +02:00
|
|
|
modifier_subpanel_register(region_type,
|
2022-04-26 16:58:53 +02:00
|
|
|
"internal_dependencies",
|
|
|
|
|
N_("Internal Dependencies"),
|
2022-04-21 15:10:07 +02:00
|
|
|
nullptr,
|
2022-04-26 16:58:53 +02:00
|
|
|
internal_dependencies_panel_draw,
|
2022-04-21 15:10:07 +02:00
|
|
|
panel_type);
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
|
2022-05-16 16:00:00 +02:00
|
|
|
static void blendWrite(BlendWriter *writer, const ID *UNUSED(id_owner), const ModifierData *md)
|
2020-12-02 13:25:25 +01:00
|
|
|
{
|
|
|
|
|
const NodesModifierData *nmd = reinterpret_cast<const NodesModifierData *>(md);
|
2022-05-16 16:00:00 +02:00
|
|
|
|
|
|
|
|
BLO_write_struct(writer, NodesModifierData, nmd);
|
|
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
if (nmd->settings.properties != nullptr) {
|
|
|
|
|
/* Note that the property settings are based on the socket type info
|
|
|
|
|
* and don't necessarily need to be written, but we can't just free them. */
|
|
|
|
|
IDP_BlendWrite(writer, nmd->settings.properties);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void blendRead(BlendDataReader *reader, ModifierData *md)
|
|
|
|
|
{
|
|
|
|
|
NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
|
2022-04-28 08:39:30 -05:00
|
|
|
if (nmd->node_group == nullptr) {
|
|
|
|
|
nmd->settings.properties = nullptr;
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
BLO_read_data_address(reader, &nmd->settings.properties);
|
|
|
|
|
IDP_BlendDataRead(reader, &nmd->settings.properties);
|
|
|
|
|
}
|
2021-07-07 11:20:19 +02:00
|
|
|
nmd->runtime_eval_log = nullptr;
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void copyData(const ModifierData *md, ModifierData *target, const int flag)
|
|
|
|
|
{
|
|
|
|
|
const NodesModifierData *nmd = reinterpret_cast<const NodesModifierData *>(md);
|
|
|
|
|
NodesModifierData *tnmd = reinterpret_cast<NodesModifierData *>(target);
|
|
|
|
|
|
|
|
|
|
BKE_modifier_copydata_generic(md, target, flag);
|
|
|
|
|
|
2021-07-07 11:20:19 +02:00
|
|
|
tnmd->runtime_eval_log = nullptr;
|
|
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
if (nmd->settings.properties != nullptr) {
|
|
|
|
|
tnmd->settings.properties = IDP_CopyProperty_ex(nmd->settings.properties, flag);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void freeData(ModifierData *md)
|
|
|
|
|
{
|
|
|
|
|
NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
|
|
|
|
|
if (nmd->settings.properties != nullptr) {
|
|
|
|
|
IDP_FreeProperty_ex(nmd->settings.properties, false);
|
|
|
|
|
nmd->settings.properties = nullptr;
|
|
|
|
|
}
|
2021-07-07 11:20:19 +02:00
|
|
|
|
|
|
|
|
clear_runtime_data(nmd);
|
2020-12-02 13:25:25 +01:00
|
|
|
}
|
|
|
|
|
|
2020-12-14 15:28:24 +01:00
|
|
|
static void requiredDataMask(Object *UNUSED(ob),
|
|
|
|
|
ModifierData *UNUSED(md),
|
|
|
|
|
CustomData_MeshMasks *r_cddata_masks)
|
|
|
|
|
{
|
|
|
|
|
/* We don't know what the node tree will need. If there are vertex groups, it is likely that the
|
|
|
|
|
* node tree wants to access them. */
|
|
|
|
|
r_cddata_masks->vmask |= CD_MASK_MDEFORMVERT;
|
2021-03-31 16:25:23 +02:00
|
|
|
r_cddata_masks->vmask |= CD_MASK_PROP_ALL;
|
2020-12-14 15:28:24 +01:00
|
|
|
}
|
|
|
|
|
|
2020-12-02 13:25:25 +01:00
|
|
|
ModifierTypeInfo modifierType_Nodes = {
|
|
|
|
|
/* name */ "GeometryNodes",
|
|
|
|
|
/* structName */ "NodesModifierData",
|
|
|
|
|
/* structSize */ sizeof(NodesModifierData),
|
|
|
|
|
/* srna */ &RNA_NodesModifier,
|
|
|
|
|
/* type */ eModifierTypeType_Constructive,
|
|
|
|
|
/* flags */
|
Geometry Nodes: Support modifier on curve objects
With this commit, curve objects support the geometry nodes modifier.
Curves objects now evaluate to `CurveEval` unless there was a previous
implicit conversion (tessellating modifiers, mesh modifiers, or the
settings in the curve "Geometry" panel). In the new code, curves are
only considered to be the wire edges-- any generated surface is a mesh
instead, stored in the evaluated geometry set.
The consolidation of concepts mentioned above allows remove a lot of
code that had to do with maintaining the `DispList` type temporarily
for modifiers and rendering. Instead, render engines see a separate
object for the mesh from the mesh geometry component, and when the
curve object evaluates to a curve, the `CurveEval` is always used for
drawing wire edges.
However, currently the `DispList` type is still maintained and used as
an intermediate step in implicit mesh conversion. In the future, more
uses of it could be changed to use `CurveEval` and `Mesh` instead.
This is mostly not changed behavior, it is just a formalization of
existing logic after recent fixes for 2.8 versions last year and two
years ago. Also, in the future more functionality can be converted
to nodes, removing cases of implicit conversions. For more discussion
on that topic, see T89676.
The `use_fill_deform` option is removed. It has not worked properly
since 2.62, and the choice for filling a curve before or after
deformation will work much better and be clearer with a node system.
Applying the geometry nodes modifier to generate a curve is not
implemented with this commit, so applying the modifier won't work
at all. This is a separate technical challenge, and should be solved
in a separate step.
Differential Revision: https://developer.blender.org/D11597
2021-09-11 13:54:40 -05:00
|
|
|
static_cast<ModifierTypeFlag>(eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_AcceptsCVs |
|
|
|
|
|
eModifierTypeFlag_SupportsEditmode |
|
|
|
|
|
eModifierTypeFlag_EnableInEditmode |
|
|
|
|
|
eModifierTypeFlag_SupportsMapping),
|
2022-05-10 19:21:26 +02:00
|
|
|
/* icon */ ICON_GEOMETRY_NODES,
|
2020-12-02 13:25:25 +01:00
|
|
|
|
|
|
|
|
/* copyData */ copyData,
|
|
|
|
|
|
|
|
|
|
/* deformVerts */ nullptr,
|
|
|
|
|
/* deformMatrices */ nullptr,
|
|
|
|
|
/* deformVertsEM */ nullptr,
|
|
|
|
|
/* deformMatricesEM */ nullptr,
|
|
|
|
|
/* modifyMesh */ modifyMesh,
|
2020-12-10 14:35:02 +01:00
|
|
|
/* modifyGeometrySet */ modifyGeometrySet,
|
2020-12-02 13:25:25 +01:00
|
|
|
|
|
|
|
|
/* initData */ initData,
|
2020-12-14 15:28:24 +01:00
|
|
|
/* requiredDataMask */ requiredDataMask,
|
2020-12-02 13:25:25 +01:00
|
|
|
/* freeData */ freeData,
|
|
|
|
|
/* isDisabled */ isDisabled,
|
|
|
|
|
/* updateDepsgraph */ updateDepsgraph,
|
2021-12-09 11:50:25 -06:00
|
|
|
/* dependsOnTime */ dependsOnTime,
|
2020-12-02 13:25:25 +01:00
|
|
|
/* dependsOnNormals */ nullptr,
|
|
|
|
|
/* foreachIDLink */ foreachIDLink,
|
2021-02-03 14:39:24 +01:00
|
|
|
/* foreachTexLink */ foreachTexLink,
|
2020-12-02 13:25:25 +01:00
|
|
|
/* freeRuntimeData */ nullptr,
|
|
|
|
|
/* panelRegister */ panelRegister,
|
|
|
|
|
/* blendWrite */ blendWrite,
|
|
|
|
|
/* blendRead */ blendRead,
|
|
|
|
|
};
|