mirror of
https://github.com/GraphiteEditor/Graphite.git
synced 2026-09-25 16:28:12 +08:00
Integrate Stable Diffusion with the Imaginate layer (#784)
* Add AI Artist layer * WIP add a button to download the rendered folder under an AI Artist layer * Successfully download the correct image * Break out image downloading JS into helper function * Change file download from using data URLs to blob URLs * WIP rasterize to blob * Remove dimensions from AI Artist layer * Successfully draw rasterized image on layer after calculation * Working txt2img generation based on user prompt * Add img2img and the main parameters * Fix ability to rasterize multi-depth documents with blob URL images by switching them to base64 * Fix test * Rasterize with artboard background color * Allow aspect ratio stretch of AI Artist images * Add automatic resolution choosing * Add a terminate button, and make the lifecycle more robust * Add negative prompt * Add range bounds for parameter inputs * Add seed * Add tiling and restore faces * Add server status check, server hostname customization, and resizing layer to fit AI Artist resolution * Fix background color of infinite canvas rasterization * Escape prompt text sent in the JSON * Revoke blob URLs when cleared/replaced to reduce memory leak * Fix welcome screen logo color * Add PreferencesMessageHandler * Add persistent storage of preferences * Fix crash introduced in previous commit when moving mouse on page load * Add tooltips to the AI Artist layer properties * Integrate AI Artist tool into the raster section of the tool shelf * Add a refresh button to the connection status * Fix crash when generating and switching to a different document tab * Add persistent image storage to AI Artist layers and fix duplication bugs * Add a generate with random seed button * Simplify and standardize message names * Majorly improve robustness of networking code * Fix race condition causing default server hostname to show disconnected when app loads with AI Artist layer selected (probably, not confirmed fixed) * Clean up messages and function calls by changing arguments into structs * Update API to more recent server commit * Add support for picking the sampling method * Add machinery for filtering selected layers with type * Replace placeholder button icons * Improve the random icon by tilting the dice * Use selected_layers() instead of repeating that code * Fix borrow error * Change message flow in progress towards fixing #797 * Allow loading image on non-active document (fixes #797) * Reduce code duplication with rasterization * Add AI Artist tool and layer icons, and remove ugly node layer icon style * Rename "AI Artist" codename to "Imaginate" feature name Co-authored-by: otdavies <oliver@psyfer.io> Co-authored-by: 0hypercube <0hypercube@gmail.com>
This commit is contained in:
Keavon Chambers
co-authored by
otdavies
0hypercube
otdavies
0hypercube
parent
06acd45a81
commit
30719bdc72
+79
-14
@@ -1,5 +1,6 @@
|
||||
use crate::boolean_ops::BooleanOperation as BooleanOperationType;
|
||||
use crate::layers::blend_mode::BlendMode;
|
||||
use crate::layers::imaginate_layer::{ImaginateSamplingMethod, ImaginateStatus};
|
||||
use crate::layers::layer_info::Layer;
|
||||
use crate::layers::style::{self, Stroke};
|
||||
use crate::layers::vector::consts::ManipulatorType;
|
||||
@@ -36,25 +37,89 @@ pub enum Operation {
|
||||
},
|
||||
AddText {
|
||||
path: Vec<LayerId>,
|
||||
transform: [f64; 6],
|
||||
insert_index: isize,
|
||||
text: String,
|
||||
transform: [f64; 6],
|
||||
style: style::PathStyle,
|
||||
text: String,
|
||||
size: f64,
|
||||
font_name: String,
|
||||
font_style: String,
|
||||
},
|
||||
AddImage {
|
||||
path: Vec<LayerId>,
|
||||
transform: [f64; 6],
|
||||
insert_index: isize,
|
||||
transform: [f64; 6],
|
||||
mime: String,
|
||||
image_data: Vec<u8>,
|
||||
},
|
||||
SetImageBlobUrl {
|
||||
AddImaginateFrame {
|
||||
path: Vec<LayerId>,
|
||||
insert_index: isize,
|
||||
transform: [f64; 6],
|
||||
},
|
||||
/// Sets a blob URL as the image source for an Image or Imaginate layer type.
|
||||
/// **Be sure to call `FrontendMessage::TriggerRevokeBlobUrl` together with this.**
|
||||
SetLayerBlobUrl {
|
||||
layer_path: Vec<LayerId>,
|
||||
blob_url: String,
|
||||
dimensions: (f64, f64),
|
||||
resolution: (f64, f64),
|
||||
},
|
||||
/// Clears the image to leave the Imaginate layer un-rendered.
|
||||
/// **Be sure to call `FrontendMessage::TriggerRevokeBlobUrl` together with this.**
|
||||
ImaginateClear {
|
||||
path: Vec<LayerId>,
|
||||
},
|
||||
ImaginateSetGeneratingStatus {
|
||||
path: Vec<LayerId>,
|
||||
percent: Option<f64>,
|
||||
status: ImaginateStatus,
|
||||
},
|
||||
ImaginateSetImageData {
|
||||
layer_path: Vec<LayerId>,
|
||||
image_data: Vec<u8>,
|
||||
},
|
||||
ImaginateSetNegativePrompt {
|
||||
path: Vec<LayerId>,
|
||||
negative_prompt: String,
|
||||
},
|
||||
ImaginateSetPrompt {
|
||||
path: Vec<LayerId>,
|
||||
prompt: String,
|
||||
},
|
||||
ImaginateSetCfgScale {
|
||||
path: Vec<LayerId>,
|
||||
cfg_scale: f64,
|
||||
},
|
||||
ImaginateSetSamples {
|
||||
path: Vec<LayerId>,
|
||||
samples: u32,
|
||||
},
|
||||
SetImaginateSamplingMethod {
|
||||
path: Vec<LayerId>,
|
||||
method: ImaginateSamplingMethod,
|
||||
},
|
||||
ImaginateSetScaleFromResolution {
|
||||
path: Vec<LayerId>,
|
||||
},
|
||||
ImaginateSetSeed {
|
||||
path: Vec<LayerId>,
|
||||
seed: u64,
|
||||
},
|
||||
ImaginateSetDenoisingStrength {
|
||||
path: Vec<LayerId>,
|
||||
denoising_strength: f64,
|
||||
},
|
||||
ImaginateSetUseImg2Img {
|
||||
path: Vec<LayerId>,
|
||||
use_img2img: bool,
|
||||
},
|
||||
ImaginateSetRestoreFaces {
|
||||
path: Vec<LayerId>,
|
||||
restore_faces: bool,
|
||||
},
|
||||
ImaginateSetTiling {
|
||||
path: Vec<LayerId>,
|
||||
tiling: bool,
|
||||
},
|
||||
SetPivot {
|
||||
layer_path: Vec<LayerId>,
|
||||
@@ -70,32 +135,32 @@ pub enum Operation {
|
||||
},
|
||||
AddPolyline {
|
||||
path: Vec<LayerId>,
|
||||
transform: [f64; 6],
|
||||
insert_index: isize,
|
||||
points: Vec<(f64, f64)>,
|
||||
transform: [f64; 6],
|
||||
style: style::PathStyle,
|
||||
points: Vec<(f64, f64)>,
|
||||
},
|
||||
AddSpline {
|
||||
path: Vec<LayerId>,
|
||||
transform: [f64; 6],
|
||||
insert_index: isize,
|
||||
points: Vec<(f64, f64)>,
|
||||
transform: [f64; 6],
|
||||
style: style::PathStyle,
|
||||
points: Vec<(f64, f64)>,
|
||||
},
|
||||
AddNgon {
|
||||
path: Vec<LayerId>,
|
||||
insert_index: isize,
|
||||
transform: [f64; 6],
|
||||
sides: u32,
|
||||
style: style::PathStyle,
|
||||
sides: u32,
|
||||
},
|
||||
AddShape {
|
||||
path: Vec<LayerId>,
|
||||
transform: [f64; 6],
|
||||
insert_index: isize,
|
||||
transform: [f64; 6],
|
||||
style: style::PathStyle,
|
||||
// TODO This will become a compound path once we support them.
|
||||
subpath: Subpath,
|
||||
style: style::PathStyle,
|
||||
},
|
||||
BooleanOperation {
|
||||
operation: BooleanOperationType,
|
||||
@@ -120,8 +185,8 @@ pub enum Operation {
|
||||
ModifyFont {
|
||||
path: Vec<LayerId>,
|
||||
font_family: String,
|
||||
font_style: String,
|
||||
size: f64,
|
||||
font_style: String,
|
||||
},
|
||||
MoveSelectedManipulatorPoints {
|
||||
layer_path: Vec<LayerId>,
|
||||
@@ -144,7 +209,7 @@ pub enum Operation {
|
||||
new_name: String,
|
||||
},
|
||||
InsertLayer {
|
||||
layer: Layer,
|
||||
layer: Box<Layer>,
|
||||
destination_path: Vec<LayerId>,
|
||||
insert_index: isize,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user