#58 small restructuring

apps/comprender/Cargo.toml

@@ -33,7 +33,7 @@ tracing = [
 dyn-comp-asset = { path = "../../crates/comp_asset" }
 dyn-comp-core = { path = "../../crates/comp_core", features = ["dtif"] }
 dyn-comp-dtif = { path = "../../crates/comp_dtif" }
-dyn-comp-common = { path = "../../crates/comp_common", features = [
+dyn-comp-bundles = { path = "../../crates/comp_bundles", features = [
     "serde_support",
 ] }
 dyn-comp-svg-builder = { path = "../../crates/comp_svg_builder", features = [

apps/comprender/src/routes/v1/render/controller.rs

@@ -12,7 +12,7 @@ use axum::{
 use bevy_app::App;
 use bevy_ecs::query::{With, Without};
 use dyn_comp_asset::asset::AssetContent;
-use dyn_comp_common::mixins::Root;
+use dyn_comp_bundles::components::mixins::Root;
 use dyn_comp_core::{resources::composition::CompositionRes, CompCorePlugin};
 use dyn_comp_dtif::DtifComposition;
 use dyn_comp_svg_builder::{svg::svg_bundle::SvgBundleVariant, CompSvgBuilderPlugin};

apps/web/src/app/(app)/app/page.tsx

@@ -96,46 +96,26 @@ const DEFAULT_DTIF: COMP.DtifComposition = {
 	paints: {
 		p1: {
 			type: 'Solid',
-			color: {
-				red: 229,
-				green: 229,
-				blue: 229
-			}
+			color: [229, 229, 229]
 		},
 		p2: {
 			type: 'Solid',
-			color: {
-				red: 0,
-				green: 128,
-				blue: 0
-			}
+			color: [0, 128, 0]
 		},
 		p3: {
 			type: 'Solid',
-			color: {
-				red: 250,
-				green: 128,
-				blue: 114
-			}
+			color: [250, 128, 114]
 		},
 		p4: {
 			type: 'Gradient',
 			variant: { type: 'Linear' },
 			stops: [
 				{
-					color: {
-						red: 138,
-						green: 43,
-						blue: 226
-					},
+					color: [138, 43, 226],
 					position: 0
 				},
 				{
-					color: {
-						red: 0,
-						green: 191,
-						blue: 225
-					},
+					color: [0, 191, 225],
 					position: 1
 				}
 			]
@@ -149,7 +129,7 @@ const DEFAULT_DTIF: COMP.DtifComposition = {
 		a1: {
 			content: {
 				type: 'Url',
-				url: 'https://raw.githubusercontent.com/dyndotart/monorepo/develop/docs/resources/images/logo-rounded.png'
+				url: 'https://avatars.githubusercontent.com/u/108551717?s=200&v=4'
 			},
 			contentType: { type: 'Png' }
 		}

crates/comp_common/Cargo.toml → crates/comp_bundles/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "dyn-comp-common"
+name = "dyn-comp-bundles"
 version = "0.0.1"
 description = ""
 edition = { workspace = true }
@@ -15,6 +15,7 @@ tracing = []
 
 [dependencies]
 dyn-comp-asset = { path = "../comp_asset" }
+dyn-utils = { path = "../utils" }
 bevy_ecs = { workspace = true }
 bevy_hierarchy = { workspace = true }
 bevy_transform = { workspace = true }

crates/comp_common/src/mixins.rs → crates/comp_bundles/src/components/mixins.rs

@@ -1,6 +1,6 @@
-use crate::common::{BlendMode, CornerRadii, Opacity, Size};
 use bevy_ecs::{component::Component, entity::Entity};
 use dyn_comp_asset::asset_id::ImageId;
+use dyn_utils::properties::{corner_radii::CornerRadii, opacity::Opacity, size::Size};
 use smallvec::SmallVec;
 
 /// Marks an entity as the root or top-level entity.
@@ -19,6 +19,31 @@ pub struct CornerRadiiMixin(pub CornerRadii);
 #[derive(Component, Debug, Default, Copy, Clone)]
 pub struct BlendModeMixin(pub BlendMode);
 
+#[derive(Debug, Default, Copy, Clone)]
+#[cfg_attr(
+    feature = "serde_support",
+    derive(serde::Serialize, serde::Deserialize, specta::Type)
+)]
+pub enum BlendMode {
+    #[default]
+    Normal,
+    Multiply,
+    Screen,
+    Overlay,
+    Darken,
+    Lighten,
+    ColorDodge,
+    ColorBurn,
+    HardLight,
+    SoftLight,
+    Difference,
+    Exclusion,
+    Hue,
+    Saturation,
+    Color,
+    Luminosity,
+}
+
 /// Controls an entity's visibility state.
 #[derive(Component, Debug, Default, Copy, Clone)]
 pub struct VisibilityMixin(pub bool);

crates/comp_bundles/src/components/mod.rs

@@ -0,0 +1,4 @@
+pub mod mixins;
+pub mod nodes;
+pub mod paints;
+pub mod styles;