refactor: 重构目录结构

Author: zty012

crates/project_graph/src/stage.rs

@@ -1,14 +1,15 @@
 pub mod camera;
 pub mod context;
+pub mod elements;
 pub mod render_context;
-pub mod structs;
 
 use camera::Camera;
 use context::StageContext;
-use eframe::egui::{self};
-use structs::EntityTrait;
 
-use crate::stage::render_context::RenderContext;
+use crate::stage::{
+    elements::{Element, ElementTrait, entities::EntityTrait},
+    render_context::RenderContext,
+};
 
 /// egui 和画布之间的桥梁
 /// 负责坐标系转换、事件处理等
@@ -34,7 +35,10 @@ impl Stage {
             let screen_center = rect.center();
             let mut visible_count = 0;
 
-            for entity in self.context.entities().values() {
+            for element in self.context.elements().values() {
+                let entity = match element {
+                    Element::Entity(e) => e,
+                };
                 // 剔除
                 if !rect.contains(entity.position()) {
                     continue;
@@ -52,7 +56,7 @@ impl Stage {
                     .show(ui.ctx(), |ui| {
                         entity.ui(
                             ui,
-                            &mut RenderContext {
+                            &RenderContext {
                                 zoom: self.camera.zoom(),
                             },
                         );

crates/project_graph/src/stage/context.rs

@@ -3,43 +3,46 @@ use std::collections::HashMap;
 use egui::Pos2;
 use nanoid::nanoid;
 
-use crate::stage::structs::{Entity, EntityTrait, Text};
+use crate::stage::elements::{
+    Element, ElementTrait,
+    entities::{Entity, text::Text},
+};
 
 pub struct StageContext {
-    entities: HashMap<String, Entity>,
+    elements: HashMap<String, Element>,
 }
 
 impl StageContext {
     pub fn new() -> Self {
         StageContext {
-            entities: HashMap::new(),
+            elements: HashMap::new(),
         }
     }
     pub fn random() -> Self {
-        let mut entities: HashMap<String, Entity> = HashMap::new();
+        let mut elements: HashMap<String, Element> = HashMap::new();
         for i in 0..1000 {
             let id = nanoid!();
-            entities.insert(
+            elements.insert(
                 id.clone(),
-                Text::new(
+                Entity::from(Text::new(
                     id,
                     Pos2::new(
                         rand::random::<f32>() * 2000.0 - 1000.0,
                         rand::random::<f32>() * 2000.0 - 1000.0,
                     ),
                     format!("节点 {}", i),
-                )
+                ))
                 .into(),
             );
         }
-        StageContext { entities }
+        StageContext { elements }
     }
 
-    pub fn entities(&self) -> &HashMap<String, Entity> {
-        &self.entities
+    pub fn elements(&self) -> &HashMap<String, Element> {
+        &self.elements
     }
 
-    pub fn add(&mut self, entity: Entity) {
-        self.entities.insert(entity.id().to_string(), entity);
+    pub fn add(&mut self, element: Element) {
+        self.elements.insert(element.id().to_string(), element);
     }
 }

crates/project_graph/src/stage/elements.rs

@@ -0,0 +1,23 @@
+pub mod connections;
+pub mod containers;
+pub mod entities;
+
+use enum_dispatch::enum_dispatch;
+
+use crate::stage::{elements::entities::Entity, render_context::RenderContext};
+
+/// 元素，以前称做舞台对象
+/// 所有可以被渲染的东西都应该实现这个 trait
+#[enum_dispatch]
+pub trait ElementTrait {
+    /// 原则上应该是一个 nanoid
+    fn id(&self) -> &str;
+    /// 渲染函数
+    fn ui(&self, ui: &mut egui::Ui, rc: &RenderContext);
+}
+
+#[enum_dispatch(ElementTrait)]
+#[derive(knus::Decode, Debug, Clone)]
+pub enum Element {
+    Entity(Entity),
+}

crates/project_graph/src/stage/elements/connections.rs

@@ -0,0 +1,10 @@
+use crate::stage::elements::ElementTrait;
+
+/// 连接关系，连接节点端口的线段
+/// 不能被包含，不能被连接
+pub trait ConnectionTrait: ElementTrait {
+    /// 起点端口 id
+    fn from_port_id(&self) -> &str;
+    /// 终点端口 id
+    fn to_port_id(&self) -> &str;
+}

crates/project_graph/src/stage/elements/containers.rs

@@ -0,0 +1,8 @@
+use crate::stage::elements::ElementTrait;
+
+/// 包含关系，包含多个节点的关系
+/// 可以被包含，可以被连接
+pub trait ContainerTrait: ElementTrait {
+    /// 包含的节点 id 列表
+    fn contained_node_ids(&self) -> Vec<&str>;
+}

crates/project_graph/src/stage/elements/entities.rs

@@ -0,0 +1,19 @@
+pub mod text;
+
+use egui::Pos2;
+use enum_dispatch::enum_dispatch;
+
+use crate::stage::elements::ElementTrait;
+
+/// 实体，有位置以及零个或多个端口且可以独立存在的物体
+#[enum_dispatch]
+pub trait EntityTrait: ElementTrait {
+    /// 位置
+    fn position(&self) -> Pos2;
+}
+
+#[enum_dispatch(ElementTrait, EntityTrait)]
+#[derive(knus::Decode, Debug, Clone)]
+pub enum Entity {
+    Text(text::Text),
+}

crates/project_graph/src/stage/elements/entities/text.rs

@@ -0,0 +1,52 @@
+use egui::Pos2;
+use nanoid::nanoid;
+
+use crate::{
+    stage::{
+        elements::{ElementTrait, entities::EntityTrait},
+        render_context::RenderContext,
+    },
+    utils::kdl::KdlPos2,
+};
+
+#[derive(knus::Decode, Debug, Clone)]
+pub struct Text {
+    #[knus(argument, default = nanoid!())]
+    id: String,
+    #[knus(child, default = KdlPos2 { x: 0.0, y: 0.0 })]
+    pos: KdlPos2,
+    #[knus(child, unwrap(argument), default = String::new())]
+    val: String,
+}
+impl Text {
+    pub fn new(id: String, pos: Pos2, val: String) -> Self {
+        Text {
+            id,
+            pos: pos.into(),
+            val,
+        }
+    }
+}
+impl ElementTrait for Text {
+    fn id(&self) -> &str {
+        &self.id
+    }
+    fn ui(&self, ui: &mut egui::Ui, rc: &RenderContext) {
+        let response = egui::Frame::new()
+            .fill(egui::Color32::from_rgba_unmultiplied(255, 255, 255, 25))
+            .corner_radius(16.0 * rc.zoom)
+            .inner_margin(egui::Margin::symmetric(12, 10) * rc.zoom)
+            .show(ui, |ui| {
+                ui.add(
+                    egui::Label::new(egui::RichText::new(&self.val).size(16.0 * rc.zoom))
+                        .wrap_mode(egui::TextWrapMode::Extend),
+                );
+            })
+            .response;
+    }
+}
+impl EntityTrait for Text {
+    fn position(&self) -> Pos2 {
+        self.pos.into()
+    }
+}

crates/project_graph/src/stage/structs.rs

@@ -2,7 +2,7 @@ use egui::Margin;
 
 use crate::stage::{
     Stage,
-    structs::{Entity, EntityTrait},
+    elements::{Element, ElementTrait},
 };
 
 pub struct Terminal {
@@ -78,12 +78,12 @@ impl Terminal {
                         if !modifiers.shift && !modifiers.ctrl && !modifiers.alt {
                             self.history
                                 .push(HistoryItem::In(self.input.clone().trim().to_string()));
-                            match knus::parse::<Vec<Entity>>("terminal_input.kdl", &self.input) {
+                            match knus::parse::<Vec<Element>>("terminal_input.kdl", &self.input) {
                                 Ok(doc) => {
-                                    for entity in doc {
-                                        stage.context.add(entity.clone());
+                                    for element in doc {
+                                        stage.context.add(element.clone());
                                         self.history
-                                            .push(HistoryItem::Out(entity.id().to_string()));
+                                            .push(HistoryItem::Out(element.id().to_string()));
                                     }
                                 }
                                 Err(e) => {