Skip to content

Commit 2784376

Browse files
committed
Function to generate overlay network
1 parent aa71af1 commit 2784376

File tree

5 files changed

+47
-9
lines changed

5 files changed

+47
-9
lines changed

editor/src/application.rs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
use crate::dispatcher::Dispatcher;
2+
use crate::messages::portfolio::document::node_graph::generate_node_graph_overlay::generate_node_graph_overlay;
23
use crate::messages::prelude::*;
4+
use graph_craft::document::{NodeInput, NodeNetwork};
5+
use graphene_std::node_graph_overlay::types::NodeGraphOverlayData;
36
pub use graphene_std::uuid::*;
47

58
// TODO: serialize with serde to save the current editor state
@@ -30,6 +33,31 @@ impl Editor {
3033
pub fn poll_node_graph_evaluation(&mut self, responses: &mut VecDeque<Message>) -> Result<(), String> {
3134
self.dispatcher.poll_node_graph_evaluation(responses)
3235
}
36+
37+
pub fn generate_node_graph_overlay_network(&mut self) -> Option<NodeNetwork> {
38+
let Some(active_document) = self.dispatcher.message_handlers.portfolio_message_handler.active_document_mut() else {
39+
return None;
40+
};
41+
let breadcrumb_network_path = &active_document.breadcrumb_network_path;
42+
let nodes_to_render = active_document.network_interface.collect_nodes(
43+
&active_document.node_graph_handler.node_graph_errors,
44+
self.dispatcher.message_handlers.preferences_message_handler.graph_wire_style,
45+
breadcrumb_network_path,
46+
);
47+
let previewed_node = active_document.network_interface.previewed_node(breadcrumb_network_path);
48+
let node_graph_render_data = NodeGraphOverlayData {
49+
nodes_to_render,
50+
open: active_document.graph_view_overlay_open,
51+
in_selected_network: &active_document.selection_network_path == breadcrumb_network_path,
52+
previewed_node,
53+
};
54+
let node_graph_overlay_node = generate_node_graph_overlay(node_graph_render_data, active_document.graph_fade_artwork_percentage);
55+
Some(NodeNetwork {
56+
exports: vec![NodeInput::node(NodeId(0), 0)],
57+
nodes: vec![(NodeId(0), node_graph_overlay_node)].into_iter().collect(),
58+
..Default::default()
59+
})
60+
}
3361
}
3462

3563
impl Default for Editor {

editor/src/dispatcher.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ pub struct DispatcherMessageHandlers {
2020
defer_message_handler: DeferMessageHandler,
2121
dialog_message_handler: DialogMessageHandler,
2222
globals_message_handler: GlobalsMessageHandler,
23-
input_preprocessor_message_handler: InputPreprocessorMessageHandler,
23+
pub input_preprocessor_message_handler: InputPreprocessorMessageHandler,
2424
key_mapping_message_handler: KeyMappingMessageHandler,
2525
layout_message_handler: LayoutMessageHandler,
2626
pub portfolio_message_handler: PortfolioMessageHandler,
27-
preferences_message_handler: PreferencesMessageHandler,
27+
pub preferences_message_handler: PreferencesMessageHandler,
2828
tool_message_handler: ToolMessageHandler,
2929
}
3030

editor/src/messages/portfolio/document/document_message_handler.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ pub struct DocumentMessageHandler {
119119
pub(crate) path: Option<PathBuf>,
120120
/// Path to network currently viewed in the node graph overlay. This will eventually be stored in each panel, so that multiple panels can refer to different networks
121121
#[serde(skip)]
122-
breadcrumb_network_path: Vec<NodeId>,
122+
pub breadcrumb_network_path: Vec<NodeId>,
123123
/// Path to network that is currently selected. Updated based on the most recently clicked panel.
124124
#[serde(skip)]
125-
selection_network_path: Vec<NodeId>,
125+
pub selection_network_path: Vec<NodeId>,
126126
/// Stack of document network snapshots for previous history states.
127127
#[serde(skip)]
128128
document_undo_history: VecDeque<NodeNetworkInterface>,

editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub struct MenuBarMessageHandler {
1818
pub has_selection_history: (bool, bool),
1919
pub message_logging_verbosity: MessageLoggingVerbosity,
2020
pub reset_node_definitions_on_open: bool,
21-
pub native_node_graph_render: bool,
21+
pub should_render_svelte_nodes: bool,
2222
pub make_path_editable_is_allowed: bool,
2323
pub data_panel_open: bool,
2424
pub layers_panel_open: bool,
@@ -49,7 +49,7 @@ impl LayoutHolder for MenuBarMessageHandler {
4949
let message_logging_verbosity_names = self.message_logging_verbosity == MessageLoggingVerbosity::Names;
5050
let message_logging_verbosity_contents = self.message_logging_verbosity == MessageLoggingVerbosity::Contents;
5151
let reset_node_definitions_on_open = self.reset_node_definitions_on_open;
52-
let native_node_graph_render = self.native_node_graph_render;
52+
let should_render_svelte_nodes = self.should_render_svelte_nodes;
5353
let make_path_editable_is_allowed = self.make_path_editable_is_allowed;
5454

5555
let menu_bar_entries = vec![
@@ -699,8 +699,8 @@ impl LayoutHolder for MenuBarMessageHandler {
699699
..MenuBarEntry::default()
700700
}],
701701
vec![MenuBarEntry {
702-
label: "Native Node Graph UI Render".into(),
703-
icon: Some(if native_node_graph_render { "CheckboxChecked" } else { "CheckboxUnchecked" }.into()),
702+
label: "HTML Node Graph Render".into(),
703+
icon: Some(if should_render_svelte_nodes { "CheckboxChecked" } else { "CheckboxUnchecked" }.into()),
704704
action: MenuBarEntry::create_action(|_| NodeGraphMessage::ToggleNativeNodeGraphRender.into()),
705705
..MenuBarEntry::default()
706706
}],

frontend/src/components/views/Graph.svelte

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@
223223
}
224224
</script>
225225

226-
{#if !$nodeGraph.nativeNodeGraphRender}
226+
{#if $nodeGraph.shouldRenderSvelteNodes}
227227
<div
228228
class="graph-background"
229229
style:--grid-spacing={`${gridSpacing}px`}
@@ -445,6 +445,8 @@
445445
{/if}
446446
{/each}
447447
</div>
448+
{:else}
449+
<div class="native-node-graph-ui">{@html $nodeGraph.nativeNodeGraphSVGString}</div>
448450
{/if}
449451

450452
<div class="graph" bind:this={graph}>
@@ -772,6 +774,14 @@
772774
}
773775
}
774776
777+
.native-node-graph-ui {
778+
position: absolute;
779+
top: 0;
780+
left: 0;
781+
width: 100%;
782+
height: 100%;
783+
}
784+
775785
.layers-and-nodes {
776786
position: absolute;
777787
top: 0;

0 commit comments

Comments
 (0)