diff --git a/editor/src/messages/portfolio/document/node_graph/node_graph_message_handler/document_node_types.rs b/editor/src/messages/portfolio/document/node_graph/node_graph_message_handler/document_node_types.rs index 75dced59..e4b94e3f 100644 --- a/editor/src/messages/portfolio/document/node_graph/node_graph_message_handler/document_node_types.rs +++ b/editor/src/messages/portfolio/document/node_graph/node_graph_message_handler/document_node_types.rs @@ -1802,14 +1802,14 @@ pub static IMAGINATE_NODE: Lazy = Lazy::new(|| DocumentNodeTyp NodeInput::Network(concrete!(Option)), NodeInput::Network(concrete!(u32)), NodeInput::Network(concrete!(ImaginateSamplingMethod)), - NodeInput::Network(concrete!(f64)), + NodeInput::Network(concrete!(f32)), NodeInput::Network(concrete!(String)), NodeInput::Network(concrete!(String)), NodeInput::Network(concrete!(bool)), - NodeInput::Network(concrete!(f64)), + NodeInput::Network(concrete!(f32)), NodeInput::Network(concrete!(Option>)), NodeInput::Network(concrete!(bool)), - NodeInput::Network(concrete!(f64)), + NodeInput::Network(concrete!(f32)), NodeInput::Network(concrete!(ImaginateMaskStartingFill)), NodeInput::Network(concrete!(bool)), NodeInput::Network(concrete!(bool)), @@ -1831,7 +1831,7 @@ pub static IMAGINATE_NODE: Lazy = Lazy::new(|| DocumentNodeTyp default: NodeInput::Network(concrete!(WasmEditorApi)), }, DocumentInputType::value("Controller", TaggedValue::ImaginateController(Default::default()), false), - DocumentInputType::value("Seed", TaggedValue::F32(0.), false), // Remember to keep index used in `ImaginateRandom` updated with this entry's index + DocumentInputType::value("Seed", TaggedValue::F64(0.), false), // Remember to keep index used in `ImaginateRandom` updated with this entry's index DocumentInputType::value("Resolution", TaggedValue::OptionalDVec2(None), false), DocumentInputType::value("Samples", TaggedValue::U32(30), false), DocumentInputType::value("Sampling Method", TaggedValue::ImaginateSamplingMethod(ImaginateSamplingMethod::EulerA), false), diff --git a/node-graph/gstd/src/imaginate.rs b/node-graph/gstd/src/imaginate.rs index 34d82655..6702cb9c 100644 --- a/node-graph/gstd/src/imaginate.rs +++ b/node-graph/gstd/src/imaginate.rs @@ -264,14 +264,14 @@ pub async fn imaginate<'a, P: Pixel>( res: impl Future>, samples: impl Future, sampling_method: impl Future, - prompt_guidance: impl Future, + prompt_guidance: impl Future, prompt: impl Future, negative_prompt: impl Future, adapt_input_image: impl Future, - image_creativity: impl Future, + image_creativity: impl Future, masking_layer: impl Future>>, inpaint: impl Future, - mask_blur: impl Future, + mask_blur: impl Future, mask_starting_fill: impl Future, improve_faces: impl Future, tiling: impl Future, @@ -332,14 +332,14 @@ async fn imaginate_maybe_fail<'a, P: Pixel, F: Fn(ImaginateStatus)>( res: impl Future>, samples: impl Future, sampling_method: impl Future, - prompt_guidance: impl Future, + prompt_guidance: impl Future, prompt: impl Future, negative_prompt: impl Future, adapt_input_image: impl Future, - image_creativity: impl Future, + image_creativity: impl Future, _masking_layer: impl Future>>, _inpaint: impl Future, - _mask_blur: impl Future, + _mask_blur: impl Future, _mask_starting_fill: impl Future, improve_faces: impl Future, tiling: impl Future, @@ -361,7 +361,7 @@ async fn imaginate_maybe_fail<'a, P: Pixel, F: Fn(ImaginateStatus)>( prompt: prompt.await, seed: seed.await, steps: samples.await, - cfg_scale: prompt_guidance.await, + cfg_scale: prompt_guidance.await as f64, width: res.x, height: res.y, restore_faces: improve_faces.await, @@ -376,7 +376,7 @@ async fn imaginate_maybe_fail<'a, P: Pixel, F: Fn(ImaginateStatus)>( override_settings: Default::default(), init_images: vec![base64_data], - denoising_strength: image_creativity.await * 0.01, + denoising_strength: image_creativity.await as f64 * 0.01, mask: None, }; let url = join_url(&base_url, SDAPI_IMAGE_TO_IMAGE)?; diff --git a/node-graph/gstd/src/raster.rs b/node-graph/gstd/src/raster.rs index cdc48270..b98285e5 100644 --- a/node-graph/gstd/src/raster.rs +++ b/node-graph/gstd/src/raster.rs @@ -475,14 +475,14 @@ generate_imaginate_node! { res: Res: Option, samples: Samples: u32, sampling_method: SamplingMethod: ImaginateSamplingMethod, - prompt_guidance: PromptGuidance: f64, + prompt_guidance: PromptGuidance: f32, prompt: Prompt: String, negative_prompt: NegativePrompt: String, adapt_input_image: AdaptInputImage: bool, - image_creativity: ImageCreativity: f64, + image_creativity: ImageCreativity: f32, masking_layer: MaskingLayer: Option>, inpaint: Inpaint: bool, - mask_blur: MaskBlur: f64, + mask_blur: MaskBlur: f32, mask_starting_fill: MaskStartingFill: ImaginateMaskStartingFill, improve_faces: ImproveFaces: bool, tiling: Tiling: bool, diff --git a/node-graph/interpreted-executor/src/node_registry.rs b/node-graph/interpreted-executor/src/node_registry.rs index 0dd4d58e..318243cf 100644 --- a/node-graph/interpreted-executor/src/node_registry.rs +++ b/node-graph/interpreted-executor/src/node_registry.rs @@ -21,6 +21,7 @@ use graphene_std::wasm_application_io::*; use gpu_executor::{GpuExecutor, ShaderInput, ShaderInputFrame}; use graphene_std::raster::*; use graphene_std::wasm_application_io::WasmEditorApi; +#[cfg(feature = "gpu")] use wgpu_executor::WgpuExecutor; use dyn_any::StaticType; @@ -481,7 +482,7 @@ fn node_registry() -> HashMap), fn_type!(u32), fn_type!(ImaginateSamplingMethod),