Skip to content

Commit 74a6881

Browse files
authored
Instance tables refactor part 7: reorganize raster data to remove TextureFrameTable (#2693)
* Partial commit 1/3: Unwrap RasterFrame and replace ImageFrameTable<Color> with RasterDataTable<Color> * Partial commit 2/3: Removal of TextureFrameTable usages * Partial commit 3/3: Document upgrade code * Fix brush broken in part 6 * Re-save the demo artwork
1 parent 2696abc commit 74a6881

40 files changed

+422
-539
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/document_message_handler.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use glam::{DAffine2, DVec2, IVec2};
3030
use graph_craft::document::value::TaggedValue;
3131
use graph_craft::document::{NodeId, NodeInput, NodeNetwork, OldNodeNetwork};
3232
use graphene_core::raster::BlendMode;
33-
use graphene_core::raster::image::ImageFrameTable;
33+
use graphene_core::raster::image::RasterDataTable;
3434
use graphene_core::vector::style::ViewMode;
3535
use graphene_std::renderer::{ClickTarget, Quad};
3636
use graphene_std::vector::{PointId, path_bool_lib};
@@ -864,7 +864,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
864864

865865
responses.add(DocumentMessage::AddTransaction);
866866

867-
let layer = graph_modification_utils::new_image_layer(ImageFrameTable::new(image), layer_node_id, self.new_layer_parent(true), responses);
867+
let layer = graph_modification_utils::new_image_layer(RasterDataTable::new(image), layer_node_id, self.new_layer_parent(true), responses);
868868

869869
if let Some(name) = name {
870870
responses.add(NodeGraphMessage::SetDisplayName {

editor/src/messages/portfolio/document/graph_operation/graph_operation_message.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use bezier_rs::Subpath;
66
use glam::{DAffine2, DVec2, IVec2};
77
use graph_craft::document::NodeId;
88
use graphene_core::raster::BlendMode;
9-
use graphene_core::raster::image::ImageFrameTable;
9+
use graphene_core::raster::image::RasterDataTable;
1010
use graphene_core::text::{Font, TypesettingConfig};
1111
use graphene_core::vector::PointId;
1212
use graphene_core::vector::VectorModificationType;
@@ -66,7 +66,7 @@ pub enum GraphOperationMessage {
6666
},
6767
NewBitmapLayer {
6868
id: NodeId,
69-
image_frame: ImageFrameTable<Color>,
69+
image_frame: RasterDataTable<Color>,
7070
parent: LayerNodeIdentifier,
7171
insert_index: usize,
7272
},

0 commit comments

Comments
 (0)