fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-19 10:58:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Instance tables refactor part 3: flatten ImageFrame<P> in lieu of Image<P> (#2256)

Browse Source 
* Remove ImageFrame<T> by flattening it into Image<T>

* Rename TextureFrame to ImageTexture

* Fix tests
This commit is contained in:
Keavon Chambers
2025-03-02 02:09:28 -08:00
parent f1160e1ca6
commit 2f6c6e28f0
19 changed files with 235 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
node-graph/gcore/src/graphic_element/renderer.rs
View File

@@ -276,6 +276,7 @@ pub struct RenderMetadata {
pub clip_targets: HashSet<NodeId>,
}
// TODO: Rename to "Graphical"
pub trait GraphicElementRendered {
fn render_svg(&self, render: &mut SvgRender, render_params: &RenderParams);
@@ -831,7 +832,7 @@ impl GraphicElementRendered for ImageFrameTable<Color> {
match render_params.image_render_mode {
ImageRenderMode::Base64 => {
let image = &instance.instance.image;
let image = &instance.instance;
if image.data.is_empty() {
return;
}
@@ -894,7 +895,7 @@ impl GraphicElementRendered for ImageFrameTable<Color> {
use vello::peniko;
for instance in self.instances() {
let image = &instance.instance.image;
let image = &instance.instance;
if image.data.is_empty() {
return;
}
@@ -918,7 +919,7 @@ impl GraphicElementRendered for RasterFrame {
};
for instance in image.instances() {
let (image, blending) = (&instance.instance.image, instance.alpha_blending);
let (image, blending) = (&instance.instance, instance.alpha_blending);
if image.data.is_empty() {
return;
}
@@ -992,9 +993,9 @@ impl GraphicElementRendered for RasterFrame {
};
match self {
RasterFrame::ImageFrame(image_frame) => {
for instance in image_frame.instances() {
let image = &instance.instance.image;
RasterFrame::ImageFrame(image) => {
for instance in image.instances() {
let image = &instance.instance;
if image.data.is_empty() {
return;
}
@@ -1004,8 +1005,8 @@ impl GraphicElementRendered for RasterFrame {
render_stuff(image, *instance.alpha_blending);
}
}
RasterFrame::TextureFrame(texture) => {
for instance in texture.instances() {
RasterFrame::TextureFrame(image_texture) => {
for instance in image_texture.instances() {
let image =
vello::peniko::Image::new(vec![].into(), peniko::Format::Rgba8, instance.instance.texture.width(), instance.instance.texture.height()).with_extend(peniko::Extend::Repeat);