Skip to content

Commit da1d4f9

Browse files
refactor: move animation types into new crate
1 parent 71e5c86 commit da1d4f9

12 files changed

Lines changed: 43 additions & 5 deletions

File tree

Cargo.lock

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ preprocessor = { path = "node-graph/preprocessor" }
7373
math-parser = { path = "libraries/math-parser" }
7474
graphene-application-io = { path = "node-graph/libraries/application-io" }
7575
graphene-resource = { path = "node-graph/libraries/resources" }
76+
graphene-animation = { path = "node-graph/libraries/animation" }
7677
core-types = { path = "node-graph/libraries/core-types" }
7778
no-std-types = { path = "node-graph/libraries/no-std-types" }
7879
raster-types = { path = "node-graph/libraries/raster-types" }

node-graph/graph-craft/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ core-types = { workspace = true, features = ["serde"] }
2727
brush-nodes = { workspace = true, features = ["serde"] }
2828
graphene-core = { workspace = true, features = ["serde"] }
2929
graphene-application-io = { workspace = true, features = ["serde"] }
30+
graphene-animation = { workspace = true, features = ["serde"] }
3031
rendering = { workspace = true, features = ["serde"] }
3132
raster-nodes = { workspace = true, features = ["serde"] }
3233
vector-nodes = { workspace = true, features = ["serde"] }

node-graph/graph-craft/src/document/value.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use crate::application_io::PlatformEditorApi;
33
use crate::application_io::resource::Resource;
44
use crate::proto::{Any as DAny, FutureAny};
55
use brush_nodes::brush_stroke::BrushStroke;
6-
use core_types::animation::AnimationCurve;
76
use core_types::color::SRGBA8;
87
use core_types::list::List;
98
use core_types::transform::Footprint;
@@ -12,6 +11,7 @@ use core_types::{CacheHash, Color, ContextFeatures, MemoHash, Node, Type, TypeDe
1211
use dyn_any::DynAny;
1312
pub use dyn_any::StaticType;
1413
pub use glam::{DAffine2, DVec2, IVec2, UVec2};
14+
use graphene_animation::AnimationCurve;
1515
use graphene_application_io::resource::ResourceHash;
1616
use graphic_types::raster_types::{CPU, Image, Raster};
1717
use graphic_types::vector_types::vector::style::{Fill, Gradient, GradientStops};

node-graph/interpreted-executor/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ wasm = ["graphene-std/wasm"]
1515
graphene-std = { workspace = true }
1616
graph-craft = { workspace = true }
1717
graphene-core = { workspace = true }
18+
graphene-animation = { workspace = true }
1819
wgpu-executor = { workspace = true }
1920
core-types = { workspace = true }
2021
dyn-any = { workspace = true }

node-graph/interpreted-executor/src/node_registry.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use core_types::animation::AnimationCurve;
21
use dyn_any::StaticType;
32
use glam::{DAffine2, DVec2, IVec2};
43
use graph_craft::application_io::PlatformEditorApi;
54
use graph_craft::document::DocumentNode;
65
use graph_craft::document::value::RenderOutput;
76
use graph_craft::proto::{NodeConstructor, TypeErasedBox};
7+
use graphene_animation::AnimationCurve;
88
use graphene_std::any::DynAnyNode;
99
use graphene_std::application_io::ImageTexture;
1010
use graphene_std::brush::brush_stroke::BrushStroke;
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[package]
2+
name = "graphene-animation"
3+
version = "0.1.0"
4+
edition = "2024"
5+
description = "Animation primitives for Graphene node system"
6+
authors = ["Graphite Authors <contact@graphite.art>"]
7+
license = "MIT OR Apache-2.0"
8+
9+
[dependencies]
10+
serde = { workspace = true, optional = true }
11+
kurbo = { workspace = true }
12+
glam = { workspace = true }
13+
dyn-any = { workspace = true }
14+
graphene-hash = { workspace = true, features = ["derive"] }
15+
16+
[features]
17+
default = ["serde"]
18+
serde = ["dep:serde"]
19+
20+
[lints]
21+
workspace = true
File renamed without changes.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
extern crate log;
22

3-
pub mod animation;
43
pub mod bounds;
54
pub mod consts;
65
pub mod context;

node-graph/nodes/gcore/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ graphene-hash = { workspace = true }
2424
raster-types = { workspace = true }
2525
graphic-types = { workspace = true }
2626
node-macro = { workspace = true }
27+
graphene-animation = { workspace = true }
2728

2829
# Workspace dependencies
2930
dyn-any = { workspace = true }

0 commit comments

Comments
 (0)