Skip to content

Add type checking to the node graph #1025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Feb 15, 2023
Merged

Add type checking to the node graph #1025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
60b5e48
Implement type inference
TrueDoctor Feb 9, 2023
355c286
Implement covariance
TrueDoctor Feb 12, 2023
7da963c
Disable rejection of generic inputs + parameters
TrueDoctor Feb 12, 2023
d02bde9
Fix lints
TrueDoctor Feb 12, 2023
ba045e7
Extend type checking to cover Network inputs
TrueDoctor Feb 12, 2023
fb5e486
Implement generic specialization
TrueDoctor Feb 13, 2023
cbd67f0
Relax covariance rules
TrueDoctor Feb 13, 2023
7cb8102
Fix type annotations for TypErasedComposeNode
TrueDoctor Feb 13, 2023
c69222e
Fix type checking errors
TrueDoctor Feb 14, 2023
c30bc7a
Apply review suggestions
TrueDoctor Feb 14, 2023
b76b554
Add documentation to type inference
TrueDoctor Feb 14, 2023
7e4d5ee
Add Imaginate node to document node types
TrueDoctor Feb 14, 2023
26e2956
Fix whitespace in macros
Keavon Feb 14, 2023
9144670
Add types to imaginate node
TrueDoctor Feb 14, 2023
864d3c6
Fix type declaration for imaginate node + add console logging
TrueDoctor Feb 14, 2023
b78de02
Use fully qualified type names as fallback during comparison
TrueDoctor Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ use document_legacy::layers::nodegraph_layer::NodeGraphFrameLayer;
use document_legacy::LayerId;
use graph_craft::document::value::TaggedValue;
use graph_craft::document::{DocumentNode, DocumentNodeImplementation, NodeId, NodeInput, NodeNetwork, NodeOutput};
use graphene_core::*;
mod document_node_types;
mod node_properties;

use glam::IVec2;

#[derive(Clone, Copy, Debug, Default, Eq, PartialEq, serde::Serialize, serde::Deserialize, specta::Type)]
#[derive(Clone, Copy, Debug, Default, Eq, PartialEq, Hash, serde::Serialize, serde::Deserialize, specta::Type)]
pub enum FrontendGraphDataType {
#[default]
#[serde(rename = "general")]
Expand Down Expand Up @@ -310,7 +311,7 @@ impl NodeGraphMessageHandler {
exposed_inputs: node
.inputs
.iter()
.zip(node_type.inputs)
.zip(node_type.inputs.iter())
.skip(1)
.filter(|(input, _)| input.is_exposed())
.map(|(_, input_type)| NodeGraphInput {
Expand Down Expand Up @@ -769,7 +770,7 @@ impl MessageHandler<NodeGraphMessage, (&mut Document, &mut dyn Iterator<Item = &
if let Some(node) = network.nodes.get_mut(node_id) {
// Extend number of inputs if not already large enough
if input_index >= node.inputs.len() {
node.inputs.extend(((node.inputs.len() - 1)..input_index).map(|_| NodeInput::Network));
node.inputs.extend(((node.inputs.len() - 1)..input_index).map(|_| NodeInput::Network(generic!(T))));
}
node.inputs[input_index] = NodeInput::Value { tagged_value: value, exposed: false };
if network.connected_to_output(*node_id) {
Expand Down
Loading