fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-16 06:38:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Migrate demo artwork and fix all failing CI tests (#1459)

Browse Source 
* Initial work on fixing tests

* Fix formatting

* Remove dead code to satisfy rustc warnings

* Insert into an artboard

* Load updated artwork in editor

* Remove popup when importing image

* Fix up demo art

* Change transform app[lication method

* Reduce number of enums called BlendMode

* Finalize the demo artwork upgrade

* Code review pass

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
0HyperCube
2023-11-19 01:06:19 +00:00
committed by Keavon Chambers
parent 719c96ecd8
commit 8a1cf3ad5d
40 changed files with 1238 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
editor/src/node_graph_executor.rs
View File

@@ -359,7 +359,6 @@ pub struct NodeGraphExecutor {
#[derive(Debug, Clone)]
struct ExecutionContext {
layer_path: Vec<LayerId>,
document_id: u64,
}
impl Default for NodeGraphExecutor {
@@ -468,7 +467,7 @@ impl NodeGraphExecutor {
}
/// Evaluates a node graph, computing the entire graph
pub fn submit_node_graph_evaluation(&mut self, (document_id, document): (u64, &mut DocumentMessageHandler), layer_path: Vec<LayerId>, viewport_resolution: UVec2) -> Result<(), String> {
pub fn submit_node_graph_evaluation(&mut self, document: &mut DocumentMessageHandler, layer_path: Vec<LayerId>, viewport_resolution: UVec2) -> Result<(), String> {
// Get the node graph layer
let network = if layer_path.is_empty() {
document.network().clone()
@@ -488,7 +487,7 @@ impl NodeGraphExecutor {
// Execute the node graph
let generation_id = self.queue_execution(network, layer_path.clone(), document_transform, viewport_resolution);
self.futures.insert(generation_id, ExecutionContext { layer_path, document_id });
self.futures.insert(generation_id, ExecutionContext { layer_path });
Ok(())
}
@@ -512,15 +511,27 @@ impl NodeGraphExecutor {
warn!("Missing node");
continue;
}
let layer = LayerNodeIdentifier::new(node_id, &document.document_network);
responses.add(FrontendMessage::UpdateDocumentLayerDetails {
data: LayerPanelEntry {
name: "Layer".to_string(),
name: if document.metadata.is_artboard(layer) {
"Artboard"
} else if document.metadata.is_folder(layer) {
"Folder"
} else {
"Layer"
}
.to_string(),
tooltip: format!("Layer id: {node_id}"),
visible: true,
layer_type: LayerDataTypeDiscriminant::Layer,
layer_type: if document.metadata.is_folder(layer) {
LayerDataTypeDiscriminant::Folder
} else {
LayerDataTypeDiscriminant::Layer
},
layer_metadata: LayerMetadata {
expanded: true,
selected: document.metadata.selected_layers_contains(LayerNodeIdentifier::new(node_id, &document.document_network)),
expanded: layer.has_children(&document.metadata),
selected: document.metadata.selected_layers_contains(layer),
},
path: vec![node_id],
thumbnail: svg.to_string(),