fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-10-05 06:28:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace terminology "primary" with "call argument" and "parameter" with "secondary input"

Browse Source
This commit is contained in:
Keavon Chambers
2024-09-25 20:05:00 -07:00
parent f8c7ada572
commit c738b4a1f9
15 changed files with 142 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs
+5 -5
View File
@@ -2495,17 +2495,17 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
let NodeMetadata { display_name, category, fields } = metadata;
let Some(implementations) = &node_registry.get(&id) else { continue };
let valid_inputs: HashSet<_> = implementations.iter().map(|(_, node_io)| node_io.input.clone()).collect();
let valid_inputs: HashSet<_> = implementations.iter().map(|(_, node_io)| node_io.call_argument.clone()).collect();
let first_node_io = implementations.first().map(|(_, node_io)| node_io).unwrap_or(const { &NodeIOTypes::empty() });
let mut input_type = &first_node_io.input;
let mut input_type = &first_node_io.call_argument;
if valid_inputs.len() > 1 {
input_type = &const { generic!(T) };
}
let output_type = &first_node_io.output;
let output_type = &first_node_io.return_value;
let inputs = fields
.iter()
.zip(first_node_io.parameters.iter())
.zip(first_node_io.inputs.iter())
.enumerate()
.map(|(index, (field, ty))| {
let exposed = if index == 0 { *ty != fn_type!(()) } else { field.exposed };
@@ -2526,7 +2526,7 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
let properties = match properties_overrides.get(id.as_str()) {
Some(properties_function) => *properties_function,
None => {
let field_types: Vec<_> = fields.iter().zip(first_node_io.parameters.iter()).map(|(field, ty)| (field.clone(), ty.clone())).collect();
let field_types: Vec<_> = fields.iter().zip(first_node_io.inputs.iter()).map(|(field, ty)| (field.clone(), ty.clone())).collect();
let properties = move |document_node: &DocumentNode, node_id: NodeId, context: &mut NodePropertiesContext| {
let rows: Vec<_> = field_types
.iter()
editor/src/messages/portfolio/document/utility_types/network_interface.rs
+3 -3
View File
@@ -511,7 +511,7 @@ impl NodeNetworkInterface {
}
}
DocumentNodeImplementation::ProtoNode(_) => {
// If a node has manual composition, then offset the input index by 1 since the proto node also includes the type of the parameter passed through manual composition.
// If a node has manual composition, then offset the input index by 1 since the proto node also includes the type of the input passed through manual composition.
let manual_composition_offset = if node.manual_composition.is_some() { 1 } else { 0 };
self.resolved_types
.types
@@ -552,7 +552,7 @@ impl NodeNetworkInterface {
let skip_footprint = if node.manual_composition.is_some() { 1 } else { 0 };
let Some(input_type) = std::iter::once(node_types.input.clone()).chain(node_types.parameters.clone()).nth(input_index + skip_footprint) else {
let Some(input_type) = std::iter::once(node_types.call_argument.clone()).chain(node_types.inputs.clone()).nth(input_index + skip_footprint) else {
log::error!("Could not get type");
return (concrete!(()), TypeSource::Error("could not get the protonode's input"));
};
@@ -678,7 +678,7 @@ impl NodeNetworkInterface {
let node_id_path = &[network_path, &[*node_id]].concat();
let primary_output_type = self.resolved_types.types.get(node_id_path).map(|ty| (ty.output.clone(), TypeSource::Compiled)).or_else(|| {
let node_types = random_protonode_implementation(protonode)?;
Some((node_types.output.clone(), TypeSource::RandomProtonodeImplementation))
Some((node_types.return_value.clone(), TypeSource::RandomProtonodeImplementation))
});
output_types.push(primary_output_type);