Migrate more nodes

Author: TrueDoctor

editor/src/messages/portfolio/document_migration.rs

@@ -85,13 +85,17 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
 			"graphene_core::transform_nodes::FreezeRealTimeNode",
 		],
 	},
+	NodeReplacement {
+		node: graphene_std::memo::monitor::IDENTIFIER,
+		aliases: &["graphene_core::ops::IntoNode<&WgpuExecutor>"],
+	},
 	NodeReplacement {
 		node: graphene_std::memo::monitor::IDENTIFIER,
 		aliases: &["graphene_core::memo::MonitorNode"],
 	},
 	NodeReplacement {
 		node: graphene_std::memo::memo::IDENTIFIER,
-		aliases: &["graphene_core::memo::MemoNode"],
+		aliases: &["graphene_core::memo::MemoNode", "graphene_core::memo::ImpureMemoNode"],
 	},
 	NodeReplacement {
 		node: graphene_std::animation::real_time::IDENTIFIER,
@@ -698,6 +702,7 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
 		node: graphene_std::vector::auto_tangents::IDENTIFIER,
 		aliases: &[
 			"graphene_core::vector::vector_nodes::AutoTangentsNode",
+			"graphene_core::vector::AutoTangentsNode",
 			"graphene_core::vector::GenerateHandlesNode",
 			"graphene_core::vector::RemoveHandlesNode",
 		],
@@ -752,7 +757,11 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
 	},
 	NodeReplacement {
 		node: graphene_std::vector::flatten_path::IDENTIFIER,
-		aliases: &["graphene_core::vector::vector_nodes::FlattenPathNode", "graphene_core::vector::FlattenVectorElementsNode"],
+		aliases: &[
+			"graphene_core::vector::vector_nodes::FlattenPathNode",
+			"graphene_core::vector::FlattenVectorElementsNode",
+			"graphene_core::vector::FlattenPathNode",
+		],
 	},
 	NodeReplacement {
 		node: graphene_std::vector::generator_nodes::arc::IDENTIFIER,
@@ -904,7 +913,11 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
 	},
 	NodeReplacement {
 		node: graphene_std::vector::vec_2_to_point::IDENTIFIER,
-		aliases: &["graphene_core::vector::vector_nodes::PositionToPointNode", "graphene_core::vector::PositionToPointNode"],
+		aliases: &[
+			"graphene_core::vector::vector_nodes::PositionToPointNode",
+			"graphene_core::vector::PositionToPointNode",
+			"graphene_core::vector::Vec2ToPointNode",
+		],
 	},
 ];
 

node-graph/libraries/core-types/src/context.rs

@@ -269,7 +269,7 @@ impl ExtractRealTime for ContextImpl<'_> {
 }
 impl ExtractIndex for ContextImpl<'_> {
 	fn try_index(&self) -> Option<impl Iterator<Item = usize>> {
-		self.index.clone().map(|x| x.into_iter().rev())
+		self.index.clone().map(|x| x.into_iter())
 	}
 }
 impl ExtractVarArgs for ContextImpl<'_> {
@@ -305,7 +305,7 @@ impl ExtractAnimationTime for OwnedContextImpl {
 }
 impl ExtractIndex for OwnedContextImpl {
 	fn try_index(&self) -> Option<impl Iterator<Item = usize>> {
-		self.index.clone().map(|x| x.into_iter().rev())
+		self.index.clone().map(|x| x.into_iter())
 	}
 }
 impl ExtractVarArgs for OwnedContextImpl {

node-graph/nodes/gcore/src/memo.rs

@@ -64,60 +64,6 @@ pub mod memo {
 	pub const IDENTIFIER: ProtoNodeIdentifier = ProtoNodeIdentifier::new("graphene_core::memo::MemoNode");
 }
 
-/// Caches the output of a given Node and acts as a proxy.
-/// In contrast to the regular `MemoNode`, this variant ignores all input.
-/// This node might result in the document not updating properly. Use with caution!
-#[derive(Default)]
-pub struct ImpureMemoNode<I, T, CachedNode> {
-	cache: Arc<Mutex<Option<T>>>,
-	node: CachedNode,
-	_phantom: std::marker::PhantomData<I>,
-}
-
-impl<'i, I: 'i, T: 'i + Clone + WasmNotSend, CachedNode: 'i> Node<'i, I> for ImpureMemoNode<I, T, CachedNode>
-where
-	CachedNode: for<'any_input> Node<'any_input, I>,
-	for<'a> <CachedNode as Node<'a, I>>::Output: Future<Output = T> + WasmNotSend,
-{
-	// TODO: This should return a reference to the cached cached_value but that requires a lot of lifetime magic
-	// TODO: (This was suggested by copilot but is pretty accurate xD)
-	type Output = DynFuture<'i, T>;
-	fn eval(&'i self, input: I) -> Self::Output {
-		if let Some(cached_value) = self.cache.lock().as_ref().unwrap().deref() {
-			let data = cached_value.clone();
-			Box::pin(async move { data })
-		} else {
-			let fut = self.node.eval(input);
-			let cache = self.cache.clone();
-			Box::pin(async move {
-				let value = fut.await;
-				*cache.lock().unwrap() = Some(value.clone());
-				value
-			})
-		}
-	}
-
-	fn reset(&self) {
-		self.cache.lock().unwrap().take();
-	}
-}
-
-impl<T, I, CachedNode> ImpureMemoNode<I, T, CachedNode> {
-	pub fn new(node: CachedNode) -> ImpureMemoNode<I, T, CachedNode> {
-		ImpureMemoNode {
-			cache: Default::default(),
-			node,
-			_phantom: std::marker::PhantomData,
-		}
-	}
-}
-
-pub mod impure_memo {
-	use core_types::ProtoNodeIdentifier;
-
-	pub const IDENTIFIER: ProtoNodeIdentifier = ProtoNodeIdentifier::new("graphene_core::memo::ImpureMemoNode");
-}
-
 /// Caches the output of the last graph evaluation for introspection
 #[derive(Default)]
 pub struct MonitorNode<I, T, N> {