Skip to content

Commit f1a1275

Browse files
adamgerhantKeavon
andauthored
Add support for adding/removing a graph's primary imports/exports separately from the secondary (#3089)
* Primary Import/Export * Primary Import/Export * Complete import exports * Final changes * Improve line width * Code review --------- Co-authored-by: Keavon Chambers <[email protected]>
1 parent ce1cd17 commit f1a1275

26 files changed

+1069
-1058
lines changed

.vscode/settings.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
},
3434
// Rust Analyzer config
3535
"rust-analyzer.cargo.allTargets": false,
36+
"rust-analyzer.procMacro.ignored": {
37+
"serde_derive": ["Serialize", "Deserialize"],
38+
"specta_macros": ["Type"] // Disabled because of: https://github.com/specta-rs/specta/issues/387
39+
},
3640
// ESLint config
3741
"eslint.format.enable": true,
3842
"eslint.workingDirectories": ["./frontend", "./website"],

demo-artwork/changing-seasons.graphite

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

demo-artwork/isometric-fountain.graphite

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

demo-artwork/marbled-mandelbrot.graphite

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

demo-artwork/painted-dreams.graphite

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

demo-artwork/parametric-dunescape.graphite

Lines changed: 1 addition & 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: 1 addition & 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: 1 addition & 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: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

editor/src/messages/frontend/frontend_message.rs

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use crate::messages::portfolio::document::utility_types::nodes::{JsRawBuffer, La
88
use crate::messages::portfolio::document::utility_types::wires::{WirePath, WirePathUpdate};
99
use crate::messages::prelude::*;
1010
use crate::messages::tool::utility_types::HintData;
11+
use glam::IVec2;
1112
use graph_craft::document::NodeId;
1213
use graphene_std::raster::Image;
1314
use graphene_std::raster::color::Color;
@@ -124,12 +125,19 @@ pub enum FrontendMessage {
124125
document_id: DocumentId,
125126
},
126127
UpdateImportsExports {
127-
imports: Vec<(FrontendGraphOutput, i32, i32)>,
128-
exports: Vec<(FrontendGraphInput, i32, i32)>,
129-
#[serde(rename = "addImport")]
130-
add_import: Option<(i32, i32)>,
131-
#[serde(rename = "addExport")]
132-
add_export: Option<(i32, i32)>,
128+
/// If the primary import is not visible, then it is None.
129+
imports: Vec<Option<FrontendGraphOutput>>,
130+
/// If the primary export is not visible, then it is None.
131+
exports: Vec<Option<FrontendGraphInput>>,
132+
/// The primary import location.
133+
#[serde(rename = "importPosition")]
134+
import_position: IVec2,
135+
/// The primary export location.
136+
#[serde(rename = "exportPosition")]
137+
export_position: IVec2,
138+
/// The document network does not have an add import or export button.
139+
#[serde(rename = "addImportExport")]
140+
add_import_export: bool,
133141
},
134142
UpdateInSelectedNetwork {
135143
#[serde(rename = "inSelectedNetwork")]

0 commit comments

Comments
 (0)