Skip to content

Commit 1cc2332

Browse files
authored
Hide the Cull node by integrating it into all generator nodes (#1538)
* Hide the Cull node by integrating it into all generator nodes * Remove internal Cull node from Mandelbrot
1 parent 0e49388 commit 1cc2332

File tree

10 files changed

+445
-65
lines changed

10 files changed

+445
-65
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1353,7 +1353,7 @@ impl DocumentMessageHandler {
13531353
.max(100.)
13541354
.range_min(Some(0.))
13551355
.range_max(Some(100.))
1356-
.mode(NumberInputMode::Range)
1356+
.mode_range()
13571357
.on_update(|number_input: &NumberInput| {
13581358
if let Some(value) = number_input.value {
13591359
DocumentMessage::SetOpacityForSelectedLayers { opacity: value / 100. }.into()

editor/src/messages/portfolio/document/node_graph/graph_operation_message_handler.rs

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ impl<'a> ModifyInputsContext<'a> {
190190
let node_type = resolve_document_node_type("Shape").expect("Shape node does not exist");
191191
node_type.to_document_node_default_inputs([Some(NodeInput::value(TaggedValue::Subpaths(subpaths), false))], Default::default())
192192
};
193-
let cull = resolve_document_node_type("Cull").expect("Cull node does not exist").default_document_node();
194193
let transform = resolve_document_node_type("Transform").expect("Transform node does not exist").default_document_node();
195194
let fill = resolve_document_node_type("Fill").expect("Fill node does not exist").default_document_node();
196195
let stroke = resolve_document_node_type("Stroke").expect("Stroke node does not exist").default_document_node();
@@ -201,10 +200,8 @@ impl<'a> ModifyInputsContext<'a> {
201200
self.insert_node_before(fill_id, stroke_id, 0, fill, IVec2::new(-8, 0));
202201
let transform_id = NodeId(generate_uuid());
203202
self.insert_node_before(transform_id, fill_id, 0, transform, IVec2::new(-8, 0));
204-
let cull_id = NodeId(generate_uuid());
205-
self.insert_node_before(cull_id, transform_id, 0, cull, IVec2::new(-8, 0));
206203
let shape_id = NodeId(generate_uuid());
207-
self.insert_node_before(shape_id, cull_id, 0, shape, IVec2::new(-8, 0));
204+
self.insert_node_before(shape_id, transform_id, 0, shape, IVec2::new(-8, 0));
208205
self.responses.add(NodeGraphMessage::SendGraph { should_rerender: true });
209206
}
210207

@@ -218,7 +215,6 @@ impl<'a> ModifyInputsContext<'a> {
218215
],
219216
Default::default(),
220217
);
221-
let cull = resolve_document_node_type("Cull").expect("Cull node does not exist").default_document_node();
222218
let transform = resolve_document_node_type("Transform").expect("Transform node does not exist").default_document_node();
223219
let fill = resolve_document_node_type("Fill").expect("Fill node does not exist").default_document_node();
224220
let stroke = resolve_document_node_type("Stroke").expect("Stroke node does not exist").default_document_node();
@@ -229,10 +225,8 @@ impl<'a> ModifyInputsContext<'a> {
229225
self.insert_node_before(fill_id, stroke_id, 0, fill, IVec2::new(-8, 0));
230226
let transform_id = NodeId(generate_uuid());
231227
self.insert_node_before(transform_id, fill_id, 0, transform, IVec2::new(-8, 0));
232-
let cull_id = NodeId(generate_uuid());
233-
self.insert_node_before(cull_id, transform_id, 0, cull, IVec2::new(-8, 0));
234228
let text_id = NodeId(generate_uuid());
235-
self.insert_node_before(text_id, cull_id, 0, text, IVec2::new(-8, 0));
229+
self.insert_node_before(text_id, transform_id, 0, text, IVec2::new(-8, 0));
236230
self.responses.add(NodeGraphMessage::SendGraph { should_rerender: true });
237231
}
238232

@@ -241,15 +235,14 @@ impl<'a> ModifyInputsContext<'a> {
241235
let node_type = resolve_document_node_type("Image").expect("Image node does not exist");
242236
node_type.to_document_node_default_inputs([Some(NodeInput::value(TaggedValue::ImageFrame(image_frame), false))], Default::default())
243237
};
244-
let sample = resolve_document_node_type("Sample").expect("Sample node does not exist").default_document_node();
245238
let transform = resolve_document_node_type("Transform").expect("Transform node does not exist").default_document_node();
246239

247240
let transform_id = NodeId(generate_uuid());
248241
self.insert_node_before(transform_id, layer, 0, transform, IVec2::new(-8, 0));
249-
let sample_id = NodeId(generate_uuid());
250-
self.insert_node_before(sample_id, transform_id, 0, sample, IVec2::new(-8, 0));
242+
251243
let image_id = NodeId(generate_uuid());
252-
self.insert_node_before(image_id, sample_id, 0, image, IVec2::new(-8, 0));
244+
self.insert_node_before(image_id, transform_id, 0, image, IVec2::new(-8, 0));
245+
253246
self.responses.add(NodeGraphMessage::SendGraph { should_rerender: true });
254247
}
255248

0 commit comments

Comments
 (0)