mirror of
https://github.com/GraphiteEditor/Graphite.git
synced 2026-09-23 12:18:12 +08:00
Update Tauri to v2 and execute only the node graph in native (#2362)
* Migrate tauri app to v2 * Move flake files to sub directory * Remove unused plugins * Backport some of the tauri code * Implement async node graph execution Only move node runtime to native code * Always use gpu feature for tauri * Fix serialization * Add logging filters * Enable native window rendering with vello * Cleanup * Remove unused editor instance * Remove changes from vite config * Remove warnings * Remove unused files * Fix most tests * Cleanup * Apply frontend lint * Readd flake.nix * Fix tests using --all-features * Code review * Enable all backends * Fix monitor node downcast types * Change debug log to a warning * Disable shader passthrough * Cleanup unused imports * Remove warning * Update project setup instructions --------- Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
co-authored by
Keavon Chambers
parent
29479f6e3e
commit
9b23c7e2db
@@ -10,7 +10,9 @@ pub struct OverlaysMessageData<'a> {
|
||||
#[derive(Debug, Clone, Default)]
|
||||
pub struct OverlaysMessageHandler {
|
||||
pub overlay_providers: HashSet<OverlayProvider>,
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
canvas: Option<web_sys::HtmlCanvasElement>,
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
context: Option<web_sys::CanvasRenderingContext2d>,
|
||||
}
|
||||
|
||||
@@ -65,10 +67,7 @@ impl MessageHandler<OverlaysMessage, OverlaysMessageData<'_>> for OverlaysMessag
|
||||
}
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
OverlaysMessage::Draw => {
|
||||
warn!(
|
||||
"Cannot render overlays on non-Wasm targets.\n{responses:?} {overlays_visible} {ipp:?} {:?} {:?}",
|
||||
self.canvas, self.context
|
||||
);
|
||||
warn!("Cannot render overlays on non-Wasm targets.\n{responses:?} {overlays_visible} {ipp:?}",);
|
||||
}
|
||||
OverlaysMessage::AddProvider(message) => {
|
||||
self.overlay_providers.insert(message);
|
||||
|
||||
@@ -24,8 +24,6 @@ use graph_craft::document::{DocumentNodeImplementation, NodeId, NodeInput};
|
||||
use graphene_core::text::{Font, TypesettingConfig};
|
||||
use graphene_std::vector::style::{Fill, FillType, Gradient};
|
||||
use graphene_std::vector::{VectorData, VectorDataTable};
|
||||
use interpreted_executor::dynamic_executor::IntrospectError;
|
||||
use std::sync::Arc;
|
||||
use std::vec;
|
||||
|
||||
pub struct PortfolioMessageData<'a> {
|
||||
@@ -1202,10 +1200,6 @@ impl PortfolioMessageHandler {
|
||||
Self { executor, ..Default::default() }
|
||||
}
|
||||
|
||||
pub async fn introspect_node(&self, node_path: &[NodeId]) -> Result<Arc<dyn std::any::Any + Send + Sync>, IntrospectError> {
|
||||
self.executor.introspect_node(node_path).await
|
||||
}
|
||||
|
||||
pub fn document(&self, document_id: DocumentId) -> Option<&DocumentMessageHandler> {
|
||||
self.documents.get(&document_id)
|
||||
}
|
||||
|
||||
@@ -37,9 +37,9 @@ impl MessageHandler<SpreadsheetMessage, ()> for SpreadsheetMessageHandler {
|
||||
self.update_layout(responses);
|
||||
}
|
||||
|
||||
SpreadsheetMessage::UpdateLayout { inspect_result } => {
|
||||
SpreadsheetMessage::UpdateLayout { mut inspect_result } => {
|
||||
self.inspect_node = Some(inspect_result.inspect_node);
|
||||
self.introspected_data = inspect_result.introspected_data;
|
||||
self.introspected_data = inspect_result.take_data();
|
||||
self.update_layout(responses)
|
||||
}
|
||||
|
||||
|
||||
@@ -713,15 +713,10 @@ impl MessageHandler<TransformLayerMessage, TransformData<'_>> for TransformLayer
|
||||
|
||||
#[cfg(test)]
|
||||
mod test_transform_layer {
|
||||
use crate::messages::portfolio::document::graph_operation::{transform_utils, utility_types::ModifyInputsContext};
|
||||
use crate::messages::portfolio::document::utility_types::misc::GroupFolderType;
|
||||
use crate::messages::{
|
||||
portfolio::document::graph_operation::{
|
||||
transform_utils,
|
||||
utility_types::{ModifyInputsContext, TransformIn},
|
||||
},
|
||||
prelude::Message,
|
||||
tool::transform_layer::transform_layer_message_handler::VectorModificationType,
|
||||
};
|
||||
use crate::messages::prelude::Message;
|
||||
use crate::messages::tool::transform_layer::transform_layer_message_handler::VectorModificationType;
|
||||
use crate::test_utils::test_prelude::*;
|
||||
use glam::DAffine2;
|
||||
use graphene_core::vector::PointId;
|
||||
@@ -1232,7 +1227,7 @@ mod test_transform_layer {
|
||||
|
||||
// Test 4: Transform layers inside transformed group
|
||||
let child_layer_id = {
|
||||
let mut document = editor.active_document_mut();
|
||||
let document = editor.active_document_mut();
|
||||
let group_children = document.network_interface.downstream_layers(&group_layer.to_node(), &[]);
|
||||
if !group_children.is_empty() {
|
||||
Some(LayerNodeIdentifier::new(group_children[0], &document.network_interface, &[]))
|
||||
|
||||
Reference in New Issue
Block a user