diff --git a/editor/src/messages/portfolio/document/document_message_handler.rs b/editor/src/messages/portfolio/document/document_message_handler.rs index 899b2466c4..263848ee2b 100644 --- a/editor/src/messages/portfolio/document/document_message_handler.rs +++ b/editor/src/messages/portfolio/document/document_message_handler.rs @@ -469,7 +469,7 @@ impl MessageHandler> for DocumentMessag let insert_index = DocumentMessageHandler::get_calculated_insert_index(self.metadata(), self.network_interface.selected_nodes(&[]).unwrap(), parent); let node_id = NodeId(generate_uuid()); - let new_group_node = super::node_graph::document_node_types::resolve_document_node_type("Merge") + let new_group_node = super::node_graph::document_node_definitions::resolve_document_node_type("Merge") .expect("Failed to create merge node") .default_node_template(); responses.add(NodeGraphMessage::InsertNode { diff --git a/editor/src/messages/portfolio/document/graph_operation/utility_types.rs b/editor/src/messages/portfolio/document/graph_operation/utility_types.rs index 9ceed5954d..e3dfd98af6 100644 --- a/editor/src/messages/portfolio/document/graph_operation/utility_types.rs +++ b/editor/src/messages/portfolio/document/graph_operation/utility_types.rs @@ -1,5 +1,5 @@ use super::transform_utils; -use crate::messages::portfolio::document::node_graph::document_node_types::resolve_document_node_type; +use crate::messages::portfolio::document::node_graph::document_node_definitions::resolve_document_node_type; use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier; use crate::messages::portfolio::document::utility_types::network_interface::{self, InputConnector, NodeNetworkInterface, OutputConnector}; use crate::messages::prelude::*; diff --git a/editor/src/messages/portfolio/document/node_graph/document_node_types.rs b/editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs similarity index 100% rename from editor/src/messages/portfolio/document/node_graph/document_node_types.rs rename to editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs diff --git a/editor/src/messages/portfolio/document/node_graph/mod.rs b/editor/src/messages/portfolio/document/node_graph/mod.rs index 7e01e0339a..bd25016438 100644 --- a/editor/src/messages/portfolio/document/node_graph/mod.rs +++ b/editor/src/messages/portfolio/document/node_graph/mod.rs @@ -1,4 +1,4 @@ -pub mod document_node_types; +pub mod document_node_definitions; mod node_graph_message; mod node_graph_message_handler; pub mod node_properties; diff --git a/editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs b/editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs index aa63db104f..26e4edb2cb 100644 --- a/editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs +++ b/editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs @@ -1,9 +1,9 @@ use super::utility_types::{BoxSelection, ContextMenuInformation, DragStart, FrontendGraphInput, FrontendGraphOutput, FrontendNode, FrontendNodeWire, WirePath}; -use super::{document_node_types, node_properties}; +use super::{document_node_definitions, node_properties}; use crate::application::generate_uuid; use crate::messages::input_mapper::utility_types::macros::action_keys; use crate::messages::layout::utility_types::widget_prelude::*; -use crate::messages::portfolio::document::node_graph::document_node_types::NodePropertiesContext; +use crate::messages::portfolio::document::node_graph::document_node_definitions::NodePropertiesContext; use crate::messages::portfolio::document::node_graph::utility_types::{ContextMenuData, FrontendGraphDataType}; use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier; use crate::messages::portfolio::document::utility_types::network_interface::{self, InputConnector, NodeNetworkInterface, NodeTemplate, OutputConnector, Previewing}; @@ -138,7 +138,7 @@ impl<'a> MessageHandler> for NodeGrap NodeGraphMessage::CreateNodeFromContextMenu { node_id, node_type, x, y } => { let node_id = node_id.unwrap_or_else(|| NodeId(generate_uuid())); - let Some(document_node_type) = document_node_types::resolve_document_node_type(&node_type) else { + let Some(document_node_type) = document_node_definitions::resolve_document_node_type(&node_type) else { responses.add(DialogMessage::DisplayDialogError { title: "Cannot insert node".to_string(), description: format!("The document node '{node_type}' does not exist in the document node list"), @@ -1214,7 +1214,7 @@ impl<'a> MessageHandler> for NodeGrap responses.add(NodeGraphMessage::SendGraph); - let node_types = document_node_types::collect_node_types(); + let node_types = document_node_definitions::collect_node_types(); responses.add(FrontendMessage::UpdateNodeTypes { node_types }); } NodeGraphMessage::UpdateTypes { resolved_types, node_graph_errors } => { diff --git a/editor/src/messages/portfolio/document/node_graph/node_properties.rs b/editor/src/messages/portfolio/document/node_graph/node_properties.rs index 1f664c0a85..670f167507 100644 --- a/editor/src/messages/portfolio/document/node_graph/node_properties.rs +++ b/editor/src/messages/portfolio/document/node_graph/node_properties.rs @@ -1,6 +1,6 @@ #![allow(clippy::too_many_arguments)] -use super::document_node_types::{NodePropertiesContext, IMAGINATE_NODE}; +use super::document_node_definitions::{NodePropertiesContext, IMAGINATE_NODE}; use super::utility_types::FrontendGraphDataType; use crate::messages::layout::utility_types::widget_prelude::*; use crate::messages::prelude::*; @@ -2323,7 +2323,7 @@ pub fn index_properties(document_node: &DocumentNode, node_id: NodeId, _context: pub fn generate_node_properties(document_node: &DocumentNode, node_id: NodeId, context: &mut NodePropertiesContext) -> LayoutGroup { let reference = context.network_interface.reference(&node_id, context.selection_network_path).clone(); let layout = if let Some(ref reference) = reference { - match super::document_node_types::resolve_document_node_type(reference) { + match super::document_node_definitions::resolve_document_node_type(reference) { Some(document_node_type) => (document_node_type.properties)(document_node, node_id, context), None => unknown_node_properties(reference), } diff --git a/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs b/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs index b75fb32b37..95c03e40df 100644 --- a/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs +++ b/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs @@ -1,6 +1,6 @@ use super::utility_types::PropertiesPanelMessageHandlerData; use crate::messages::layout::utility_types::widget_prelude::*; -use crate::messages::portfolio::document::node_graph::document_node_types::NodePropertiesContext; +use crate::messages::portfolio::document::node_graph::document_node_definitions::NodePropertiesContext; use crate::messages::portfolio::utility_types::PersistentData; use crate::messages::prelude::*; diff --git a/editor/src/messages/portfolio/portfolio_message_handler.rs b/editor/src/messages/portfolio/portfolio_message_handler.rs index 61122b5afc..170798b198 100644 --- a/editor/src/messages/portfolio/portfolio_message_handler.rs +++ b/editor/src/messages/portfolio/portfolio_message_handler.rs @@ -423,7 +423,7 @@ impl MessageHandler> for PortfolioMes .get(node_id) .and_then(|node| node.persistent_metadata.reference.as_ref()) { - let node_definition = crate::messages::portfolio::document::node_graph::document_node_types::resolve_document_node_type(reference).unwrap(); + let node_definition = crate::messages::portfolio::document::node_graph::document_node_definitions::resolve_document_node_type(reference).unwrap(); let default_definition_node = node_definition.default_node_template(); document.network_interface.set_implementation(node_id, &[], default_definition_node.document_node.implementation); } @@ -459,7 +459,7 @@ impl MessageHandler> for PortfolioMes continue; }; if reference == "Fill" && node.inputs.len() == 8 { - let node_definition = crate::messages::portfolio::document::node_graph::document_node_types::resolve_document_node_type(reference).unwrap(); + let node_definition = crate::messages::portfolio::document::node_graph::document_node_definitions::resolve_document_node_type(reference).unwrap(); let document_node = node_definition.default_node_template().document_node; document.network_interface.set_implementation(node_id, &[], document_node.implementation.clone()); diff --git a/editor/src/messages/tool/tool_messages/brush_tool.rs b/editor/src/messages/tool/tool_messages/brush_tool.rs index bb6edccb51..470553ca6f 100644 --- a/editor/src/messages/tool/tool_messages/brush_tool.rs +++ b/editor/src/messages/tool/tool_messages/brush_tool.rs @@ -1,6 +1,6 @@ use super::tool_prelude::*; use crate::messages::portfolio::document::graph_operation::transform_utils::{get_current_normalized_pivot, get_current_transform}; -use crate::messages::portfolio::document::node_graph::document_node_types::resolve_document_node_type; +use crate::messages::portfolio::document::node_graph::document_node_definitions::resolve_document_node_type; use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier; use crate::messages::portfolio::document::utility_types::network_interface::FlowType; use crate::messages::tool::common_functionality::color_selector::{ToolColorOptions, ToolColorType}; diff --git a/editor/src/messages/tool/tool_messages/ellipse_tool.rs b/editor/src/messages/tool/tool_messages/ellipse_tool.rs index f7fb96a88e..2893b127db 100644 --- a/editor/src/messages/tool/tool_messages/ellipse_tool.rs +++ b/editor/src/messages/tool/tool_messages/ellipse_tool.rs @@ -1,6 +1,6 @@ use super::tool_prelude::*; use crate::messages::portfolio::document::graph_operation::utility_types::TransformIn; -use crate::messages::portfolio::document::node_graph::document_node_types::resolve_document_node_type; +use crate::messages::portfolio::document::node_graph::document_node_definitions::resolve_document_node_type; use crate::messages::portfolio::document::overlays::utility_types::OverlayContext; use crate::messages::tool::common_functionality::auto_panning::AutoPanning; use crate::messages::tool::common_functionality::color_selector::{ToolColorOptions, ToolColorType}; diff --git a/editor/src/messages/tool/tool_messages/freehand_tool.rs b/editor/src/messages/tool/tool_messages/freehand_tool.rs index b617ad9ffb..d539323a90 100644 --- a/editor/src/messages/tool/tool_messages/freehand_tool.rs +++ b/editor/src/messages/tool/tool_messages/freehand_tool.rs @@ -1,5 +1,5 @@ use super::tool_prelude::*; -use crate::messages::portfolio::document::node_graph::document_node_types::resolve_document_node_type; +use crate::messages::portfolio::document::node_graph::document_node_definitions::resolve_document_node_type; use crate::messages::portfolio::document::overlays::utility_functions::path_endpoint_overlays; use crate::messages::portfolio::document::overlays::utility_types::OverlayContext; use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier; diff --git a/editor/src/messages/tool/tool_messages/line_tool.rs b/editor/src/messages/tool/tool_messages/line_tool.rs index 65ee40a868..e102542207 100644 --- a/editor/src/messages/tool/tool_messages/line_tool.rs +++ b/editor/src/messages/tool/tool_messages/line_tool.rs @@ -1,7 +1,7 @@ use super::tool_prelude::*; use crate::consts::LINE_ROTATE_SNAP_ANGLE; use crate::messages::portfolio::document::graph_operation::utility_types::TransformIn; -use crate::messages::portfolio::document::node_graph::document_node_types::resolve_document_node_type; +use crate::messages::portfolio::document::node_graph::document_node_definitions::resolve_document_node_type; use crate::messages::portfolio::document::overlays::utility_types::OverlayContext; use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier; use crate::messages::tool::common_functionality::auto_panning::AutoPanning; diff --git a/editor/src/messages/tool/tool_messages/pen_tool.rs b/editor/src/messages/tool/tool_messages/pen_tool.rs index 9749fb43d1..517c913041 100644 --- a/editor/src/messages/tool/tool_messages/pen_tool.rs +++ b/editor/src/messages/tool/tool_messages/pen_tool.rs @@ -1,7 +1,7 @@ use super::tool_prelude::*; use crate::consts::HIDE_HANDLE_DISTANCE; use crate::consts::LINE_ROTATE_SNAP_ANGLE; -use crate::messages::portfolio::document::node_graph::document_node_types::resolve_document_node_type; +use crate::messages::portfolio::document::node_graph::document_node_definitions::resolve_document_node_type; use crate::messages::portfolio::document::overlays::utility_functions::path_overlays; use crate::messages::portfolio::document::overlays::utility_types::OverlayContext; use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier; diff --git a/editor/src/messages/tool/tool_messages/polygon_tool.rs b/editor/src/messages/tool/tool_messages/polygon_tool.rs index a7148843ff..14f922b83a 100644 --- a/editor/src/messages/tool/tool_messages/polygon_tool.rs +++ b/editor/src/messages/tool/tool_messages/polygon_tool.rs @@ -1,6 +1,6 @@ use super::tool_prelude::*; use crate::messages::portfolio::document::graph_operation::utility_types::TransformIn; -use crate::messages::portfolio::document::node_graph::document_node_types::resolve_document_node_type; +use crate::messages::portfolio::document::node_graph::document_node_definitions::resolve_document_node_type; use crate::messages::portfolio::document::overlays::utility_types::OverlayContext; use crate::messages::tool::common_functionality::auto_panning::AutoPanning; use crate::messages::tool::common_functionality::color_selector::{ToolColorOptions, ToolColorType}; diff --git a/editor/src/messages/tool/tool_messages/rectangle_tool.rs b/editor/src/messages/tool/tool_messages/rectangle_tool.rs index 4d1233a81b..697729088e 100644 --- a/editor/src/messages/tool/tool_messages/rectangle_tool.rs +++ b/editor/src/messages/tool/tool_messages/rectangle_tool.rs @@ -1,5 +1,5 @@ use super::tool_prelude::*; -use crate::messages::portfolio::document::node_graph::document_node_types::resolve_document_node_type; +use crate::messages::portfolio::document::node_graph::document_node_definitions::resolve_document_node_type; use crate::messages::portfolio::document::{graph_operation::utility_types::TransformIn, overlays::utility_types::OverlayContext}; use crate::messages::tool::common_functionality::auto_panning::AutoPanning; use crate::messages::tool::common_functionality::color_selector::{ToolColorOptions, ToolColorType}; diff --git a/editor/src/messages/tool/tool_messages/spline_tool.rs b/editor/src/messages/tool/tool_messages/spline_tool.rs index 1d8c981ac5..31236e08e1 100644 --- a/editor/src/messages/tool/tool_messages/spline_tool.rs +++ b/editor/src/messages/tool/tool_messages/spline_tool.rs @@ -1,6 +1,6 @@ use super::tool_prelude::*; use crate::consts::DRAG_THRESHOLD; -use crate::messages::portfolio::document::node_graph::document_node_types::resolve_document_node_type; +use crate::messages::portfolio::document::node_graph::document_node_definitions::resolve_document_node_type; use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier; use crate::messages::tool::common_functionality::auto_panning::AutoPanning; use crate::messages::tool::common_functionality::color_selector::{ToolColorOptions, ToolColorType}; diff --git a/editor/src/node_graph_executor.rs b/editor/src/node_graph_executor.rs index 27af96b023..028f5817e2 100644 --- a/editor/src/node_graph_executor.rs +++ b/editor/src/node_graph_executor.rs @@ -1,6 +1,6 @@ use crate::consts::FILE_SAVE_SUFFIX; use crate::messages::frontend::utility_types::{ExportBounds, FileType}; -use crate::messages::portfolio::document::node_graph::document_node_types::wrap_network_in_scope; +use crate::messages::portfolio::document::node_graph::document_node_definitions::wrap_network_in_scope; use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier; use crate::messages::prelude::*; diff --git a/frontend/wasm/src/editor_api.rs b/frontend/wasm/src/editor_api.rs index e50a60aa64..93c71bc6df 100644 --- a/frontend/wasm/src/editor_api.rs +++ b/frontend/wasm/src/editor_api.rs @@ -675,7 +675,7 @@ impl EditorHandle { ) { use editor::messages::portfolio::document::graph_operation::transform_utils::*; use editor::messages::portfolio::document::graph_operation::utility_types::*; - use editor::messages::portfolio::document::node_graph::document_node_types::resolve_document_node_type; + use editor::messages::portfolio::document::node_graph::document_node_definitions::resolve_document_node_type; use editor::node_graph_executor::replace_node_runtime; use editor::node_graph_executor::NodeRuntime; use graph_craft::document::NodeInput;