Skip to content

Commit 226ee15

Browse files
committed
Migrate context and add a few missing migrations
1 parent d8e6118 commit 226ee15

File tree

2 files changed

+48
-10
lines changed

2 files changed

+48
-10
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ cargo-gpu = { git = "https://github.com/Firestar99/cargo-gpu", rev = "3952a22d16
233233
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spirv"))'] }
234234

235235
[profile.dev]
236-
opt-level = 0
236+
opt-level = 1
237237

238238
[profile.dev.package]
239239
no-std-types = { opt-level = 1 }

editor/src/messages/portfolio/document_migration.rs

Lines changed: 47 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ const TEXT_REPLACEMENTS: &[(&str, &str)] = &[
2222
("graphene_core::vector::vector_nodes::SamplePointsNode", "graphene_core::vector::SamplePolylineNode"),
2323
("graphene_core::vector::vector_nodes::SubpathSegmentLengthsNode", "graphene_core::vector::SubpathSegmentLengthsNode"),
2424
("\"manual_composition\":null", "\"manual_composition\":{\"Generic\":\"T\"}"),
25+
(
26+
"core::option::Option<alloc::sync::Arc<graphene_core::context::OwnedContextImpl>>",
27+
"core::option::Option<alloc::sync::Arc<core_types::context::OwnedContextImpl>>",
28+
),
29+
("graphene_core::transform::Footprint", "graphene_core::transform::Footprint"),
2530
];
2631

2732
pub struct NodeReplacement<'a> {
@@ -50,15 +55,19 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
5055
// ================================
5156
NodeReplacement {
5257
node: graphene_std::brush::brush::blit::IDENTIFIER,
53-
aliases: &["graphene_brush::BlitNode", "graphene_std::brush::BlitNode"],
58+
aliases: &["graphene_brush::BlitNode", "graphene_std::brush::BlitNode", "graphene_brush::brush::BlitNode"],
5459
},
5560
NodeReplacement {
5661
node: graphene_std::brush::brush::brush::IDENTIFIER,
57-
aliases: &["graphene_brush::BrushNode", "graphene_std::brush::BrushNode"],
62+
aliases: &["graphene_brush::BrushNode", "graphene_std::brush::BrushNode", "graphene_brush::brush::BrushNode"],
5863
},
5964
NodeReplacement {
6065
node: graphene_std::brush::brush::brush_stamp_generator::IDENTIFIER,
61-
aliases: &["graphene_brush::BrushStampGeneratorNode", "graphene_std::brush::BrushStampGeneratorNode"],
66+
aliases: &[
67+
"graphene_brush::BrushStampGeneratorNode",
68+
"graphene_std::brush::BrushStampGeneratorNode",
69+
"graphene_brush::brush::BrushStampGeneratorNode",
70+
],
6271
},
6372
// ================================
6473
// gcore
@@ -171,7 +180,11 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
171180
},
172181
NodeReplacement {
173182
node: graphene_std::graphic::index_elements::IDENTIFIER,
174-
aliases: &["graphene_core::graphic_element::IndexNode", "graphene_core::graphic::IndexNode"],
183+
aliases: &[
184+
"graphene_core::graphic_element::IndexNode",
185+
"graphene_core::graphic::IndexNode",
186+
"graphene_core::graphic::IndexElementsNode",
187+
],
175188
},
176189
NodeReplacement {
177190
node: graphene_std::graphic::legacy_layer_extend::IDENTIFIER,
@@ -282,11 +295,19 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
282295
},
283296
NodeReplacement {
284297
node: graphene_std::math_nodes::greatest_common_divisor::IDENTIFIER,
285-
aliases: &["graphene_math_nodes::GreatestCommonDivisor", "graphene_core::ops::GreatestCommonDivisor"],
298+
aliases: &[
299+
"graphene_math_nodes::GreatestCommonDivisor",
300+
"graphene_core::ops::GreatestCommonDivisor",
301+
"graphene_math_nodes::GreatestCommonDivisorNode",
302+
],
286303
},
287304
NodeReplacement {
288305
node: graphene_std::math_nodes::least_common_multiple::IDENTIFIER,
289-
aliases: &["graphene_math_nodes::LeastCommonMultiple", "graphene_core::ops::LeastCommonMultiple"],
306+
aliases: &[
307+
"graphene_math_nodes::LeastCommonMultiple",
308+
"graphene_core::ops::LeastCommonMultiple",
309+
"graphene_math_nodes::LeastCommonMultipleNode",
310+
],
290311
},
291312
NodeReplacement {
292313
node: graphene_std::math_nodes::length::IDENTIFIER,
@@ -347,6 +368,10 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
347368
node: graphene_std::math_nodes::multiply::IDENTIFIER,
348369
aliases: &["graphene_math_nodes::MultiplyNode", "graphene_core::ops::MultiplyNode"],
349370
},
371+
NodeReplacement {
372+
node: graphene_std::math_nodes::normalize::IDENTIFIER,
373+
aliases: &["graphene_math_nodes::NormalizeNode"],
374+
},
350375
NodeReplacement {
351376
node: graphene_std::math_nodes::not_equals::IDENTIFIER,
352377
aliases: &["graphene_math_nodes::NotEqualsNode", "graphene_core::ops::NotEqualsNode"],
@@ -464,6 +489,10 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
464489
"graphene_core::raster::adjustments::BrightnessContrastNode",
465490
],
466491
},
492+
NodeReplacement {
493+
node: graphene_std::raster_nodes::adjustments::brightness_contrast_classic::IDENTIFIER,
494+
aliases: &["graphene_raster_nodes::adjustments::BrightnessContrastClassicNode"],
495+
},
467496
NodeReplacement {
468497
node: graphene_std::raster_nodes::adjustments::channel_mixer::IDENTIFIER,
469498
aliases: &[
@@ -480,6 +509,7 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
480509
"raster_nodes::adjustments::ColorOverlayNode",
481510
"graphene_core::raster::adjustments::ColorOverlayNode",
482511
"raster_nodes::generate_curves::ColorOverlayNode",
512+
"graphene_raster_nodes::blending_nodes::ColorOverlayNode",
483513
],
484514
},
485515
NodeReplacement {
@@ -649,7 +679,11 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
649679
// ================================
650680
NodeReplacement {
651681
node: graphene_std::transform_nodes::decompose_rotation::IDENTIFIER,
652-
aliases: &["graphene_core::transform_nodes::RotationScaleNode", "graphene_core::transform::RotationScaleNode"],
682+
aliases: &[
683+
"graphene_core::transform_nodes::RotationScaleNode",
684+
"graphene_core::transform::RotationScaleNode",
685+
"graphene_core::transform_nodes::DecomposeRotationNode",
686+
],
653687
},
654688
NodeReplacement {
655689
node: graphene_std::transform_nodes::decompose_scale::IDENTIFIER,
@@ -688,7 +722,7 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
688722
// ================================
689723
NodeReplacement {
690724
node: graphene_std::vector::apply_transform::IDENTIFIER,
691-
aliases: &["graphene_core::vector::ApplyTransformNode"],
725+
aliases: &["graphene_core::vector::ApplyTransformNode", "graphene_core::vector::vector_modification::ApplyTransformNode"],
692726
},
693727
NodeReplacement {
694728
node: graphene_std::vector::area::IDENTIFIER,
@@ -745,7 +779,11 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
745779
},
746780
NodeReplacement {
747781
node: graphene_std::vector::cut_segments::IDENTIFIER,
748-
aliases: &["graphene_core::vector::vector_nodes::SplitSegmentsNode", "graphene_core::vector::SplitSegmentsNode"],
782+
aliases: &[
783+
"graphene_core::vector::vector_nodes::SplitSegmentsNode",
784+
"graphene_core::vector::SplitSegmentsNode",
785+
"graphene_core::vector::CutSegmentsNode",
786+
],
749787
},
750788
NodeReplacement {
751789
node: graphene_std::vector::dimensions::IDENTIFIER,

0 commit comments

Comments
 (0)