Skip to content

Commit 5637f01

Browse files
authored
Rename GraphicElement -> Graphic and trait GraphicElementRendered -> Render (#2987)
1 parent 9a4a7de commit 5637f01

30 files changed

+243
-245
lines changed

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/portfolio/document/graph_operation/utility_types.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use graphene_std::text::{Font, TypesettingConfig};
1717
use graphene_std::vector::VectorData;
1818
use graphene_std::vector::style::{Fill, Stroke};
1919
use graphene_std::vector::{PointId, VectorModificationType};
20-
use graphene_std::{GraphicElement, NodeInputDecleration};
20+
use graphene_std::{Graphic, NodeInputDecleration};
2121

2222
#[derive(PartialEq, Clone, Copy, Debug, serde::Serialize, serde::Deserialize)]
2323
pub enum TransformIn {
@@ -303,7 +303,7 @@ impl<'a> ModifyInputsContext<'a> {
303303
// TODO: Allow the path node to operate on Graphic Group data by utilizing the reference for each vector data in a group.
304304
if node_definition.identifier == "Path" {
305305
let layer_input_type = self.network_interface.input_type(&InputConnector::node(output_layer.to_node(), 1), &[]).0.nested_type().clone();
306-
if layer_input_type == concrete!(Table<GraphicElement>) {
306+
if layer_input_type == concrete!(Table<Graphic>) {
307307
let Some(flatten_path_definition) = resolve_document_node_type("Flatten Path") else {
308308
log::error!("Flatten Path does not exist in ModifyInputsContext::existing_node_id");
309309
return None;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use graphene_std::transform::{Footprint, ReferencePoint, Transform};
2626
use graphene_std::vector::VectorData;
2727
use graphene_std::vector::misc::{ArcType, CentroidType, GridType, MergeByDistanceAlgorithm, PointSpacingType};
2828
use graphene_std::vector::style::{Fill, FillChoice, FillType, GradientStops, GradientType, PaintOrder, StrokeAlign, StrokeCap, StrokeJoin};
29-
use graphene_std::{GraphicElement, NodeInputDecleration};
29+
use graphene_std::{Graphic, NodeInputDecleration};
3030

3131
pub(crate) fn string_properties(text: &str) -> Vec<LayoutGroup> {
3232
let widget = TextLabel::new(text).widget_holder();
@@ -185,7 +185,7 @@ pub(crate) fn property_from_type(
185185
// ====================
186186
Some(x) if x == TypeId::of::<Table<VectorData>>() => vector_data_widget(default_info).into(),
187187
Some(x) if x == TypeId::of::<Table<Raster<CPU>>>() || x == TypeId::of::<Table<Raster<GPU>>>() => raster_widget(default_info).into(),
188-
Some(x) if x == TypeId::of::<Table<GraphicElement>>() => group_widget(default_info).into(),
188+
Some(x) if x == TypeId::of::<Table<Graphic>>() => group_widget(default_info).into(),
189189
// ============
190190
// STRUCT TYPES
191191
// ============

0 commit comments

Comments
 (0)