Page MenuHome
Differential D10151 Diff 33493 source/blender/makesrna/intern/rna_nodetree.c

Changeset View

Standalone View

View Options

source/blender/makesrna/intern/rna_nodetree.c

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 440 Lines • ▼ Show 20 Linesstatic const EnumPropertyItem rna_node_geometry_point_distribute_method_items[] = {
{0, NULL, 0, NULL, NULL}, {0, NULL, 0, NULL, NULL},
}; };
#endif #endif
#define ITEM_ATTRIBUTE \ #define ITEM_ATTRIBUTE \
{ \ { \
GEO_NODE_ATTRIBUTE_INPUT_ATTRIBUTE, "ATTRIBUTE", 0, "Attribute", "" \ GEO_NODE_ATTRIBUTE_INPUT_ATTRIBUTE, "ATTRIBUTE", 0, "Attribute", "" \
} }
JacquesLuckeUnsubmitted
Done
Inline Actions

Tooltip mentions "object".

JacquesLucke: Tooltip mentions "object".
HooglyBooglyUnsubmitted
Done
Inline Actions

There is no "input object" in this context. I believe this should discuss the collection offset instead

HooglyBoogly: There is no "input object" in this context. I believe this should discuss the collection offset…
dfelintoUnsubmitted
Done
Inline Actions

Tooltip STILL mentions "object"

dfelinto: Tooltip STILL mentions "object"
zeddbAuthorUnsubmitted
Done
Inline Actions

The object info mentions "object" as well.
I've modified the tooltip to be more clear that it is the modifer object transform.
(Collections do not have any transforms, only offset data)

zeddb: The object info mentions "object" as well. I've modified the tooltip to be more clear that it…
#define ITEM_FLOAT \ #define ITEM_FLOAT \
{ \ { \
GEO_NODE_ATTRIBUTE_INPUT_FLOAT, "FLOAT", 0, "Float", "" \ GEO_NODE_ATTRIBUTE_INPUT_FLOAT, "FLOAT", 0, "Float", "" \
} }
#define ITEM_VECTOR \ #define ITEM_VECTOR \
{ \ { \
GEO_NODE_ATTRIBUTE_INPUT_VECTOR, "VECTOR", 0, "Vector", "" \ GEO_NODE_ATTRIBUTE_INPUT_VECTOR, "VECTOR", 0, "Vector", "" \
} }
▲ Show 20 Lines • Show All 8,436 Lines • ▼ Show 20 Lines static EnumPropertyItem resolution_mode_items[] = {
"VOXEL_SIZE", "VOXEL_SIZE",
0, 0,
"Size", "Size",
"Specify the voxel side length"}, "Specify the voxel side length"},
{0, NULL, 0, NULL, NULL}, {0, NULL, 0, NULL, NULL},
}; };
RNA_def_struct_sdna_from(srna, "NodeGeometryPointsToVolume", "storage"); RNA_def_struct_sdna_from(srna, "NodeGeometryPointsToVolume", "storage");
dfelintoUnsubmitted
Done
Inline Actions

Can you use the same tooltip as the object info node?

dfelinto: Can you use the same tooltip as the object info node?
prop = RNA_def_property(srna, "resolution_mode", PROP_ENUM, PROP_NONE); prop = RNA_def_property(srna, "resolution_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, resolution_mode_items); RNA_def_property_enum_items(prop, resolution_mode_items);
RNA_def_property_ui_text(prop, "Resolution Mode", "How the voxel size is specified"); RNA_def_property_ui_text(prop, "Resolution Mode", "How the voxel size is specified");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
prop = RNA_def_property(srna, "input_type_radius", PROP_ENUM, PROP_NONE); prop = RNA_def_property(srna, "input_type_radius", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, rna_node_geometry_attribute_input_type_items_float); RNA_def_property_enum_items(prop, rna_node_geometry_attribute_input_type_items_float);
RNA_def_property_ui_text(prop, "Radius Input Type", ""); RNA_def_property_ui_text(prop, "Radius Input Type", "");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
} }
static void def_geo_collection_info(StructRNA *srna)
{
PropertyRNA *prop;
static const EnumPropertyItem rna_node_geometry_collection_info_transform_space_items[] = {
{GEO_NODE_TRANSFORM_SPACE_ORIGINAL,
"ORIGINAL",
0,
"Original",
"Output the geometry relative to the collection offset"},
JacquesLuckeUnsubmitted
Not Done
Inline Actions

This still talks about an "input object"...

JacquesLucke: This still talks about an "input object"...
zeddbAuthorUnsubmitted
Not Done
Inline Actions

Isn't this talking about the modifier object though?
The collection does not have any transform (expect for the offset parameter).

zeddb: Isn't this talking about the modifier object though? The collection does not have any transform…
dfelintoUnsubmitted
Not Done
Inline Actions

@Sebastian Parborg (zeddb) if you look at the object info node you can see that there is "input object" and "modified object":

Relative: "Bring the input object geometry, location, rotation and scale into the modified object, maintaining the relative position between the two objects in the scene".

dfelinto: @zeddb if you look at the object info node you can see that there is "input object" and…
zeddbAuthorUnsubmitted
Not Done
Inline Actions

That is for the relative tool tip and not for the "original" tool tip that were a discussing now.

Other tip reads:
"Output the geometry relative to the input object transform, and the location, rotation and scale relative to the world origin."

We don't use the info node input object transform in anyway, so we must be talking to about the modifier object here.
But I synced the tooltips as requested.

However if I'm wrong then I would like to have some suggestions on what to change it to.

zeddb: That is for the relative tool tip and not for the "original" tool tip that were a discussing…
{GEO_NODE_TRANSFORM_SPACE_RELATIVE,
"RELATIVE",
0,
"Relative",
HooglyBooglyUnsubmitted
Done
Inline Actions

I'm also not sure why these need to be so different from the object info tooltips, aside from the obvious differences.
With the patch as is, there is no coherence between the descriptions on the two nodes.

I know this is usually not a deal breaker, but we're adding the node right now, this is the time to get it right.

Something like these mirrors the existing tooltips much more closely.
Output the geometry relative to the input object transforms and the collection offset
Bring the input object geometry into the modified object, maintaining the relative position between the objects in the scene

HooglyBoogly: I'm also not sure why these need to be so different from the object info tooltips, aside from…
zeddbAuthorUnsubmitted
Done
Inline Actions

The issue is that I think those two are wrong.

Let me explain:
Output the geometry relative to the input object transforms and the collection offset

We are not outputting the geometry relative to the input object. We are outputting the geometry with the input object transform.
IE we are taking the raw geometry data and applying the modifier objects obmat on it.

So it is not relative, it is literately the input object transform.
So here simply replacing "relative to" with "with" so:
Output the geometry with the input object transforms and the collection offset

Is more correct and is more verbose I feel, relatively speaking ;)

Bring the input object geometry into the modified object, maintaining the relative position between the objects in the scene

"relative position" is wrong here.
If it were relative, it would move when the modifier object moves.
Otherwise it is not maintaining the relative distance between the two objects.
Now the position it has stays the same no matter how you move the modifier object.
This is more of maintaining an absolute position if nothing else.

The correct tip would be:
Apply the modifier object transform and then its inverse to make it keep its original transform.

However something along the lines of "Keep it as is" tip is easier to understand.

After writing all this down, I realized that I think we should rethink the "Original/Relative" labels again.
This is essentially Apply/Keep transform. I don't feel there is any original/relative about these to in this case.

However we could also see it as a selector for which objects transform we should use.
So we could have something like "Modifier/Input Object" so you select which transform to use.

zeddb: The issue is that I think those two are wrong. Let me explain: `Output the geometry relative…
"Bring the input collection geometry into the modified object, maintaining the relative "
"position between the objects in the scene."},
{0, NULL, 0, NULL, NULL},
};
RNA_def_struct_sdna_from(srna, "NodeGeometryCollectionInfo", "storage");
prop = RNA_def_property(srna, "transform_space", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, rna_node_geometry_collection_info_transform_space_items);
RNA_def_property_ui_text(prop, "Transform Space", "The transformation of the geometry output");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
}
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
static void rna_def_shader_node(BlenderRNA *brna) static void rna_def_shader_node(BlenderRNA *brna)
{ {
StructRNA *srna; StructRNA *srna;
srna = RNA_def_struct(brna, "ShaderNode", "NodeInternal"); srna = RNA_def_struct(brna, "ShaderNode", "NodeInternal");
RNA_def_struct_ui_text(srna, "Shader Node", "Material shader node"); RNA_def_struct_ui_text(srna, "Shader Node", "Material shader node");
▲ Show 20 Lines • Show All 1,912 Lines • Show Last 20 Lines