Skip to content

Commit 8a0241f

Browse files
authored
Fix running tests locally; fix migrations for relocated nodes (#2805)
* fix `BoundingBox for Raster<GPU>` when `wgpu` feature is disabled * fix `tinyvec` crate not being `std` by default * fixup migration for `CoordinateValueNode` * fixup migration for raster nodes
1 parent a182a73 commit 8a0241f

File tree

3 files changed

+30
-4
lines changed

3 files changed

+30
-4
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ petgraph = { version = "0.7.1", default-features = false, features = [
150150
"graphmap",
151151
] }
152152
half = { version = "2.4.1", default-features = false, features = ["bytemuck", "serde"] }
153-
tinyvec = { version = "1" }
153+
tinyvec = { version = "1", features = ["std"] }
154154
criterion = { version = "0.5", features = ["html_reports"] }
155155
iai-callgrind = { version = "0.12.3" }
156156
ndarray = "0.16.1"

editor/src/messages/portfolio/document_migration.rs

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ const REPLACEMENTS: &[(&str, &str)] = &[
6262
("graphene_core::ops::NumberValueNode", "graphene_math_nodes::NumberValueNode"),
6363
("graphene_core::ops::PercentageValueNode", "graphene_math_nodes::PercentageValueNode"),
6464
("graphene_core::ops::CoordinateValueNode", "graphene_math_nodes::CoordinateValueNode"),
65+
("graphene_core::ops::ConstructVector2", "graphene_math_nodes::CoordinateValueNode"),
66+
("graphene_core::ops::Vector2ValueNode", "graphene_math_nodes::CoordinateValueNode"),
6567
("graphene_core::ops::ColorValueNode", "graphene_math_nodes::ColorValueNode"),
6668
("graphene_core::ops::GradientValueNode", "graphene_math_nodes::GradientValueNode"),
6769
("graphene_core::ops::StringValueNode", "graphene_math_nodes::StringValueNode"),
@@ -76,8 +78,6 @@ const REPLACEMENTS: &[(&str, &str)] = &[
7678
("graphene_core::logic::LogicAndNode", "graphene_core::ops::LogicAndNode"),
7779
("graphene_core::logic::LogicNotNode", "graphene_core::ops::LogicNotNode"),
7880
("graphene_core::logic::LogicOrNode", "graphene_core::ops::LogicOrNode"),
79-
("graphene_core::ops::ConstructVector2", "graphene_core::ops::CoordinateValueNode"),
80-
("graphene_core::ops::Vector2ValueNode", "graphene_core::ops::CoordinateValueNode"),
8181
("graphene_core::raster::BlendModeNode", "graphene_core::blending_nodes::BlendModeNode"),
8282
("graphene_core::raster::OpacityNode", "graphene_core::blending_nodes::OpacityNode"),
8383
("graphene_core::raster::BlendingNode", "graphene_core::blending_nodes::BlendingNode"),
@@ -121,8 +121,24 @@ const REPLACEMENTS: &[(&str, &str)] = &[
121121
("graphene_core::raster::PosterizeNode", "graphene_raster_nodes::adjustments::PosterizeNode"),
122122
("graphene_core::raster::adjustments::ExposureNode", "graphene_raster_nodes::adjustments::ExposureNode"),
123123
("graphene_core::raster::ExposureNode", "graphene_raster_nodes::adjustments::ExposureNode"),
124+
("graphene_core::raster::adjustments::ColorOverlayNode", "graphene_raster_nodes::adjustments::ColorOverlayNode"),
125+
("graphene_raster_nodes::generate_curves::ColorOverlayNode", "graphene_raster_nodes::adjustments::ColorOverlayNode"),
126+
// raster
124127
("graphene_core::raster::adjustments::GenerateCurvesNode", "graphene_raster_nodes::generate_curves::GenerateCurvesNode"),
125-
("graphene_core::raster::adjustments::ColorOverlayNode", "graphene_raster_nodes::generate_curves::ColorOverlayNode"),
128+
("graphene_std::dehaze::DehazeNode", "graphene_raster_nodes::dehaze::DehazeNode"),
129+
("graphene_std::filter::BlurNode", "graphene_raster_nodes::filter::BlurNode"),
130+
(
131+
"graphene_std::image_color_palette::ImageColorPaletteNode",
132+
"graphene_raster_nodes::image_color_palette::ImageColorPaletteNode",
133+
),
134+
("graphene_std::raster::SampleImageNode", "graphene_raster_nodes::std_nodes::SampleImageNode"),
135+
("graphene_std::raster::CombineChannelsNode", "graphene_raster_nodes::std_nodes::CombineChannelsNode"),
136+
("graphene_std::raster::MaskNode", "graphene_raster_nodes::std_nodes::MaskNode"),
137+
("graphene_std::raster::ExtendImageToBoundsNode", "graphene_raster_nodes::std_nodes::ExtendImageToBoundsNode"),
138+
("graphene_std::raster::EmptyImageNode", "graphene_raster_nodes::std_nodes::EmptyImageNode"),
139+
("graphene_std::raster::ImageValueNode", "graphene_raster_nodes::std_nodes::ImageValueNode"),
140+
("graphene_std::raster::NoisePatternNode", "graphene_raster_nodes::std_nodes::NoisePatternNode"),
141+
("graphene_std::raster::MandelbrotNode", "graphene_raster_nodes::std_nodes::MandelbrotNode"),
126142
// text
127143
("graphene_core::text::TextGeneratorNode", "graphene_core::text::TextNode"),
128144
// transform

node-graph/gcore/src/raster_types.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,20 @@ impl Raster<GPU> {
9797
let RasterStorage::Gpu(gpu) = &self.data else { unreachable!() };
9898
gpu.clone()
9999
}
100+
}
101+
102+
impl Raster<GPU> {
103+
#[cfg(feature = "wgpu")]
100104
pub fn is_empty(&self) -> bool {
101105
let data = self.data();
102106
data.width() == 0 || data.height() == 0
103107
}
108+
#[cfg(not(feature = "wgpu"))]
109+
pub fn is_empty(&self) -> bool {
110+
true
111+
}
104112
}
113+
105114
#[cfg(feature = "wgpu")]
106115
impl Deref for Raster<GPU> {
107116
type Target = wgpu::Texture;
@@ -110,6 +119,7 @@ impl Deref for Raster<GPU> {
110119
self.data()
111120
}
112121
}
122+
113123
pub type RasterDataTable<Storage> = Instances<Raster<Storage>>;
114124

115125
// TODO: Make this not dupliated

0 commit comments

Comments
 (0)