mirror of
https://github.com/GraphiteEditor/Graphite.git
synced 2026-09-16 06:38:03 +08:00
* Breadcrumb visualization, nested network consistency, create definitions for Merge internal nodes * Add index to network inputs, remove imports usage from flatten network * Replace NodeOutput with NodeInput::Node * Fully remove imports field, remove unnecessary identity nodes, move Output node to encapsulating network * Replace previous_outputs with root_node, fix adding artboard/layer to empty network * Import/Export UI nodes * Display input/output types dynamically from compiled network * Add LayerNodeIdentifer::ROOT_PARENT * Prevent .to_node() on ROOT_PARENT * Separate NodeGraphMessage and GraphOperationMessage * General bug fixes with nested networks * Change layer color, various bug fixes and improvements * Fix disconnect and set node input for proto nodes and UI export node * Dashed line to export for previewed node * Fix deleting proto nodes and nodes that feed into export * Allow modifications to nodes outside of nested network * Get network from Node Id parameter * Change root_node to previous_root_node * Get TaggedValue from proto node implementation type when disconnecting * Improve preview functionality and state * Artboard position and delete children fix * Name inputs/outputs based on DocumentNodeDefinition or type, fix new artboard/layer insertion * replace "Link" with "Wire", adjust previewing * Various bug fixes and improvements * Modify Sample and Poisson-Disk points, fix incorrect input index and deleting currently viewed node * Open demo artwork * Fix opening already upgraded documents and refactor FrontendGraphDataType usages * Fix deleting within network and other bugs * Get default node input from compiled network when copying, fix previews, tests, demo artwork * Code cleanup * Hide EditorApi and add a comment describing unresolved Import node input types * Code review * Replace placeholder ROOT_PARENT NodeId with std::u64::MAX * Breadcrumb padding --------- Co-authored-by: Keavon Chambers <keavon@keavon.com>
122 lines
3.3 KiB
Rust
122 lines
3.3 KiB
Rust
pub mod dynamic_executor;
|
|
pub mod node_registry;
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use graph_craft::document::value::TaggedValue;
|
|
use graphene_core::*;
|
|
|
|
use futures::executor::block_on;
|
|
|
|
#[test]
|
|
fn execute_add() {
|
|
use graph_craft::document::*;
|
|
use graph_craft::*;
|
|
|
|
fn add_network() -> NodeNetwork {
|
|
NodeNetwork {
|
|
exports: vec![NodeInput::node(NodeId(1), 0)],
|
|
nodes: [
|
|
(
|
|
NodeId(0),
|
|
DocumentNode {
|
|
name: "Cons".into(),
|
|
inputs: vec![NodeInput::network(concrete!(u32), 0), NodeInput::network(concrete!(&u32), 1)],
|
|
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::structural::ConsNode<_, _>")),
|
|
..Default::default()
|
|
},
|
|
),
|
|
(
|
|
NodeId(1),
|
|
DocumentNode {
|
|
name: "Add".into(),
|
|
inputs: vec![NodeInput::node(NodeId(0), 0)],
|
|
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::ops::AddPairNode")),
|
|
..Default::default()
|
|
},
|
|
),
|
|
]
|
|
.into_iter()
|
|
.collect(),
|
|
..Default::default()
|
|
}
|
|
}
|
|
|
|
let network = NodeNetwork {
|
|
exports: vec![NodeInput::node(NodeId(0), 0)],
|
|
nodes: [(
|
|
NodeId(0),
|
|
DocumentNode {
|
|
name: "Inc".into(),
|
|
inputs: vec![
|
|
NodeInput::network(concrete!(u32), 0),
|
|
NodeInput::Value {
|
|
tagged_value: graph_craft::document::value::TaggedValue::U32(1u32),
|
|
exposed: false,
|
|
},
|
|
],
|
|
implementation: DocumentNodeImplementation::Network(add_network()),
|
|
..Default::default()
|
|
},
|
|
)]
|
|
.into_iter()
|
|
.collect(),
|
|
..Default::default()
|
|
};
|
|
|
|
use crate::dynamic_executor::DynamicExecutor;
|
|
use graph_craft::graphene_compiler::{Compiler, Executor};
|
|
|
|
let compiler = Compiler {};
|
|
let protograph = compiler.compile_single(network).expect("Graph should be generated");
|
|
|
|
let exec = block_on(DynamicExecutor::new(protograph)).unwrap_or_else(|e| panic!("Failed to create executor: {e:?}"));
|
|
|
|
let result = block_on((&exec).execute(32_u32)).unwrap();
|
|
assert_eq!(result, TaggedValue::U32(33));
|
|
}
|
|
|
|
#[test]
|
|
fn double_number() {
|
|
use graph_craft::document::*;
|
|
use graph_craft::*;
|
|
|
|
let network = NodeNetwork {
|
|
exports: vec![NodeInput::node(NodeId(1), 0)],
|
|
nodes: [
|
|
// Simple identity node taking a number as input from outside the graph
|
|
(
|
|
NodeId(0),
|
|
DocumentNode {
|
|
name: "id".into(),
|
|
inputs: vec![NodeInput::network(concrete!(u32), 0)],
|
|
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::ops::IdentityNode")),
|
|
..Default::default()
|
|
},
|
|
),
|
|
// An add node adding the result of the id node to its self
|
|
(
|
|
NodeId(1),
|
|
DocumentNode {
|
|
name: "Add".into(),
|
|
inputs: vec![NodeInput::node(NodeId(0), 0), NodeInput::node(NodeId(0), 0)],
|
|
implementation: DocumentNodeImplementation::ProtoNode(ProtoNodeIdentifier::new("graphene_core::ops::AddNode<_>")),
|
|
..Default::default()
|
|
},
|
|
),
|
|
]
|
|
.into_iter()
|
|
.collect(),
|
|
..Default::default()
|
|
};
|
|
|
|
use crate::dynamic_executor::DynamicExecutor;
|
|
use graph_craft::graphene_compiler::Compiler;
|
|
|
|
let compiler = Compiler {};
|
|
let protograph = compiler.compile_single(network).expect("Graph should be generated");
|
|
|
|
let _exec = block_on(DynamicExecutor::new(protograph)).map(|_e| panic!("The network should not type check ")).unwrap_err();
|
|
}
|
|
}
|