Skip to content

Commit a53b509

Browse files
committed
Fix demo art
1 parent 474b301 commit a53b509

File tree

10 files changed

+289757
-30
lines changed

10 files changed

+289757
-30
lines changed

demo-artwork/isometric-fountain.graphite

Lines changed: 86420 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/just-a-potted-cactus.graphite

Lines changed: 44783 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/procedural-string-lights.graphite

Lines changed: 10880 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/red-dress.graphite

Lines changed: 86855 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/valley-of-spires.graphite

Lines changed: 60818 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

editor/src/dispatcher.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -493,14 +493,11 @@ mod test {
493493

494494
let document = editor.dispatcher.message_handlers.portfolio_message_handler.active_document_mut().unwrap();
495495
for node in document.network.nodes.values_mut().filter(|d| d.name == "Artboard") {
496-
if node.inputs.len() < 7 {
497-
node.inputs.push(NodeInput::value(TaggedValue::NodeAlias(String::new()), false));
498-
}
499496
if let Some(network) = node.implementation.get_network_mut() {
500497
for node in network.nodes.values_mut() {
501498
if node.name == "To Artboard" {
502499
node.implementation = DocumentNodeImplementation::proto("graphene_core::ConstructArtboardNode<_, _, _, _, _, _>");
503-
node.inputs.push(NodeInput::network(graphene_core::concrete!(String), 6));
500+
node.inputs.insert(1, NodeInput::value(TaggedValue::String("Artboard".to_string()), false));
504501
}
505502
}
506503
}

editor/src/messages/portfolio/document/node_graph/document_node_types.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
316316
DocumentInputType::value("Dimensions", TaggedValue::IVec2(glam::IVec2::new(1920, 1080)), false),
317317
DocumentInputType::value("Background", TaggedValue::Color(Color::WHITE), false),
318318
DocumentInputType::value("Clip", TaggedValue::Bool(false), false),
319-
DocumentInputType::value("Alias", TaggedValue::NodeAlias(String::new()), false),
320319
],
321320
outputs: vec![DocumentOutputType::new("Out", FrontendGraphDataType::Artboard)],
322321
properties: node_properties::artboard_properties,

node-graph/graph-craft/src/document.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,24 +1319,6 @@ impl NodeNetwork {
13191319
}
13201320
}
13211321

1322-
/// Resolve nodes using TaggedValue::NodeAlias to access their alias e.g. artboard node
1323-
pub fn resolve_alias(&mut self) {
1324-
for node in self.nodes.values_mut() {
1325-
if let Some(network) = node.implementation.get_network_mut() {
1326-
network.resolve_alias();
1327-
}
1328-
for input in node.inputs.iter_mut() {
1329-
if let NodeInput::Value {
1330-
tagged_value: crate::document::TaggedValue::NodeAlias(alias),
1331-
..
1332-
} = input
1333-
{
1334-
*alias = node.alias.clone();
1335-
}
1336-
}
1337-
}
1338-
}
1339-
13401322
/// Converts the `DocumentNode`s with a `DocumentNodeImplementation::Extract` into a `ClonedNode` that returns
13411323
/// the `DocumentNode` specified by the single `NodeInput::Node`.
13421324
/// The referenced node is removed from the network, and any `NodeInput::Node`s used by the referenced node are replaced with a generically typed network input.

node-graph/graph-craft/src/document/value.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ tagged_value! {
170170
VectorModification(graphene_core::vector::VectorModification),
171171
CentroidType(graphene_core::vector::misc::CentroidType),
172172
BooleanOperation(graphene_core::vector::misc::BooleanOperation),
173-
NodeAlias(String),
174173
}
175174

176175
impl<'a> TaggedValue {

node-graph/graph-craft/src/graphene_compiler.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ pub struct Compiler {}
99

1010
impl Compiler {
1111
pub fn compile(&self, mut network: NodeNetwork) -> Result<impl Iterator<Item = ProtoNetwork>, String> {
12-
network.resolve_alias();
1312
println!("flattening");
1413
let node_ids = network.nodes.keys().copied().collect::<Vec<_>>();
1514
for id in node_ids {

0 commit comments

Comments
 (0)