wallet: rename ui::Mesh to VectorArt

bin/darkwallet/gui/print_tree.py

@@ -29,8 +29,8 @@ def print_node_info(parent_id, indent):
                 child_type = "render_layer"
             case SceneNodeType.RENDER_OBJECT:
                 child_type = "render_object"
-            case SceneNodeType.RENDER_MESH:
-                child_type = "render_mesh"
+            case SceneNodeType.RENDER_VECTOR_ART:
+                child_type = "render_vector_art"
             case SceneNodeType.RENDER_TEXT:
                 child_type = "render_text"
             case SceneNodeType.RENDER_TEXTURE:

bin/darkwallet/pydrk/api.py

@@ -51,7 +51,7 @@ class SceneNodeType:
     MOUSE = 8
     RENDER_LAYER = 3
     RENDER_OBJECT = 4
-    RENDER_MESH = 5
+    RENDER_VECTOR_ART = 5
     RENDER_TEXT = 9
     RENDER_TEXTURE = 13
     FONTS = 10

bin/darkwallet/src/app/mod.rs

@@ -38,7 +38,9 @@ use crate::{
         SceneNodeType, Slot,
     },
     text::TextShaperPtr,
-    ui::{chatview, Button, ChatView, EditBox, Image, Mesh, RenderLayer, Stoppable, Text, Window},
+    ui::{
+        chatview, Button, ChatView, EditBox, Image, RenderLayer, Stoppable, Text, VectorArt, Window,
+    },
     ExecutorPtr,
 };
 
@@ -231,7 +233,7 @@ impl App {
         match &node.pimpl {
             Pimpl::Window(win) => win.stop().await,
             Pimpl::RenderLayer(layer) => layer.stop().await,
-            Pimpl::Mesh(mesh) => mesh.stop().await,
+            Pimpl::VectorArt(svg) => svg.stop().await,
             Pimpl::Text(txt) => txt.stop().await,
             Pimpl::EditBox(ebox) => ebox.stop().await,
             Pimpl::ChatView(_) | Pimpl::Image(_) | Pimpl::Button(_) => {}

bin/darkwallet/src/app/node.rs

@@ -27,7 +27,9 @@ use crate::{
         SceneNodeType, Slot,
     },
     text::TextShaperPtr,
-    ui::{chatview, Button, ChatView, EditBox, Image, Mesh, RenderLayer, Stoppable, Text, Window},
+    ui::{
+        chatview, Button, ChatView, EditBox, Image, RenderLayer, Stoppable, Text, VectorArt, Window,
+    },
     ExecutorPtr,
 };
 
@@ -45,9 +47,9 @@ pub fn create_layer(sg: &mut SceneGraph, name: &str) -> SceneNodeId {
     node.id
 }
 
-pub fn create_mesh(sg: &mut SceneGraph, name: &str) -> SceneNodeId {
-    debug!(target: "app", "create_mesh({name})");
-    let node = sg.add_node(name, SceneNodeType::RenderMesh);
+pub fn create_vector_art(sg: &mut SceneGraph, name: &str) -> SceneNodeId {
+    debug!(target: "app", "create_vector_art({name})");
+    let node = sg.add_node(name, SceneNodeType::RenderVectorArt);
 
     let mut prop = Property::new("rect", PropertyType::Float32, PropertySubType::Pixel);
     prop.set_array_len(4);
@@ -80,7 +82,7 @@ pub fn create_button(sg: &mut SceneGraph, name: &str) -> SceneNodeId {
 
 pub fn create_image(sg: &mut SceneGraph, name: &str) -> SceneNodeId {
     debug!(target: "app", "create_image({name})");
-    let node = sg.add_node(name, SceneNodeType::RenderMesh);
+    let node = sg.add_node(name, SceneNodeType::Image);
 
     let mut prop = Property::new("rect", PropertyType::Float32, PropertySubType::Pixel);
     prop.set_array_len(4);

bin/darkwallet/src/app/schema.rs

@@ -30,14 +30,16 @@ use crate::{
         SceneNodeType, Slot,
     },
     text::TextShaperPtr,
-    ui::{chatview, Button, ChatView, EditBox, Image, Mesh, RenderLayer, Stoppable, Text, Window},
+    ui::{
+        chatview, Button, ChatView, EditBox, Image, RenderLayer, Stoppable, Text, VectorArt, Window,
+    },
     ExecutorPtr,
 };
 
 use super::{
     node::{
-        create_button, create_chatview, create_editbox, create_image, create_layer, create_mesh,
-        create_text,
+        create_button, create_chatview, create_editbox, create_image, create_layer, create_text,
+        create_vector_art,
     },
     populate_tree, App,
 };
@@ -99,7 +101,7 @@ pub(super) async fn make_old(app: &App) {
     sg.link(node_id, window_id).unwrap();
 
     // Create a bg mesh
-    let node_id = create_mesh(&mut sg, "bg");
+    let node_id = create_vector_art(&mut sg, "bg");
 
     let node = sg.get_node_mut(node_id).unwrap();
     let prop = node.get_property("rect").unwrap();
@@ -127,9 +129,15 @@ pub(super) async fn make_old(app: &App) {
     ];
     let indices = vec![0, 2, 1, 1, 2, 3];
     drop(sg);
-    let pimpl =
-        Mesh::new(app.ex.clone(), app.sg.clone(), node_id, app.render_api.clone(), verts, indices)
-            .await;
+    let pimpl = VectorArt::new(
+        app.ex.clone(),
+        app.sg.clone(),
+        node_id,
+        app.render_api.clone(),
+        verts,
+        indices,
+    )
+    .await;
     let mut sg = app.sg.lock().await;
     let node = sg.get_node_mut(node_id).unwrap();
     node.pimpl = pimpl;
@@ -137,7 +145,7 @@ pub(super) async fn make_old(app: &App) {
     sg.link(node_id, layer_node_id).unwrap();
 
     // Create button bg
-    let node_id = create_mesh(&mut sg, "btnbg");
+    let node_id = create_vector_art(&mut sg, "btnbg");
 
     let node = sg.get_node_mut(node_id).unwrap();
     let prop = node.get_property("rect").unwrap();
@@ -176,9 +184,15 @@ pub(super) async fn make_old(app: &App) {
     };
     let indices = vec![0, 2, 1, 1, 2, 3];
     drop(sg);
-    let pimpl =
-        Mesh::new(app.ex.clone(), app.sg.clone(), node_id, app.render_api.clone(), verts, indices)
-            .await;
+    let pimpl = VectorArt::new(
+        app.ex.clone(),
+        app.sg.clone(),
+        node_id,
+        app.render_api.clone(),
+        verts,
+        indices,
+    )
+    .await;
     let mut sg = app.sg.lock().await;
     let node = sg.get_node_mut(node_id).unwrap();
     node.pimpl = pimpl;
@@ -211,7 +225,7 @@ pub(super) async fn make_old(app: &App) {
     sg.link(node_id, layer_node_id).unwrap();
 
     // Create another mesh
-    let node_id = create_mesh(&mut sg, "box");
+    let node_id = create_vector_art(&mut sg, "box");
 
     let node = sg.get_node_mut(node_id).unwrap();
     let prop = node.get_property("rect").unwrap();
@@ -248,9 +262,15 @@ pub(super) async fn make_old(app: &App) {
     };
     let indices = vec![0, 2, 1, 1, 2, 3];
     drop(sg);
-    let pimpl =
-        Mesh::new(app.ex.clone(), app.sg.clone(), node_id, app.render_api.clone(), verts, indices)
-            .await;
+    let pimpl = VectorArt::new(
+        app.ex.clone(),
+        app.sg.clone(),
+        node_id,
+        app.render_api.clone(),
+        verts,
+        indices,
+    )
+    .await;
     let mut sg = app.sg.lock().await;
     let node = sg.get_node_mut(node_id).unwrap();
     node.pimpl = pimpl;
@@ -258,7 +278,7 @@ pub(super) async fn make_old(app: &App) {
     sg.link(node_id, layer_node_id).unwrap();
 
     // Debugging tool
-    let node_id = create_mesh(&mut sg, "debugtool");
+    let node_id = create_vector_art(&mut sg, "debugtool");
 
     let node = sg.get_node_mut(node_id).unwrap();
     let prop = node.get_property("rect").unwrap();
@@ -287,9 +307,15 @@ pub(super) async fn make_old(app: &App) {
     ];
     let indices = vec![0, 2, 1, 1, 2, 3];
     drop(sg);
-    let pimpl =
-        Mesh::new(app.ex.clone(), app.sg.clone(), node_id, app.render_api.clone(), verts, indices)
-            .await;
+    let pimpl = VectorArt::new(
+        app.ex.clone(),
+        app.sg.clone(),
+        node_id,
+        app.render_api.clone(),
+        verts,
+        indices,
+    )
+    .await;
     let mut sg = app.sg.lock().await;
     let node = sg.get_node_mut(node_id).unwrap();
     node.pimpl = pimpl;
@@ -297,7 +323,7 @@ pub(super) async fn make_old(app: &App) {
     sg.link(node_id, layer_node_id).unwrap();
 
     // Debugging tool
-    let node_id = create_mesh(&mut sg, "debugtool2");
+    let node_id = create_vector_art(&mut sg, "debugtool2");
 
     let node = sg.get_node_mut(node_id).unwrap();
     let prop = node.get_property("rect").unwrap();
@@ -326,9 +352,15 @@ pub(super) async fn make_old(app: &App) {
     ];
     let indices = vec![0, 2, 1, 1, 2, 3];
     drop(sg);
-    let pimpl =
-        Mesh::new(app.ex.clone(), app.sg.clone(), node_id, app.render_api.clone(), verts, indices)
-            .await;
+    let pimpl = VectorArt::new(
+        app.ex.clone(),
+        app.sg.clone(),
+        node_id,
+        app.render_api.clone(),
+        verts,
+        indices,
+    )
+    .await;
     let mut sg = app.sg.lock().await;
     let node = sg.get_node_mut(node_id).unwrap();
     node.pimpl = pimpl;
@@ -614,7 +646,7 @@ pub(super) async fn make(app: &App) {
     sg.link(node_id, window_id).unwrap();
 
     // Create a bg mesh
-    let node_id = create_mesh(&mut sg, "bg");
+    let node_id = create_vector_art(&mut sg, "bg");
 
     let node = sg.get_node_mut(node_id).unwrap();
     let prop = node.get_property("rect").unwrap();
@@ -642,9 +674,15 @@ pub(super) async fn make(app: &App) {
     ];
     let indices = vec![0, 2, 1, 1, 2, 3];
     drop(sg);
-    let pimpl =
-        Mesh::new(app.ex.clone(), app.sg.clone(), node_id, app.render_api.clone(), verts, indices)
-            .await;
+    let pimpl = VectorArt::new(
+        app.ex.clone(),
+        app.sg.clone(),
+        node_id,
+        app.render_api.clone(),
+        verts,
+        indices,
+    )
+    .await;
     let mut sg = app.sg.lock().await;
     let node = sg.get_node_mut(node_id).unwrap();
     node.pimpl = pimpl;
@@ -751,7 +789,7 @@ pub(super) async fn make(app: &App) {
     sg.link(node_id, layer_node_id).unwrap();
 
     // Create the editbox bg
-    let node_id = create_mesh(&mut sg, "editbox_bg");
+    let node_id = create_vector_art(&mut sg, "editbox_bg");
 
     let node = sg.get_node_mut(node_id).unwrap();
     let prop = node.get_property("rect").unwrap();
@@ -775,7 +813,7 @@ pub(super) async fn make(app: &App) {
         [0., 0.13, 0.08, 1.],
         &Rectangle { x: 0., y: 0., w: 1., h: 1. },
     );
-    let pimpl = Mesh::new(
+    let pimpl = VectorArt::new(
         app.ex.clone(),
         app.sg.clone(),
         node_id,
@@ -791,7 +829,7 @@ pub(super) async fn make(app: &App) {
     sg.link(node_id, layer_node_id).unwrap();
 
     // Create the nick - editbox sep
-    let node_id = create_mesh(&mut sg, "editbox_lhs_sep");
+    let node_id = create_vector_art(&mut sg, "editbox_lhs_sep");
 
     let node = sg.get_node_mut(node_id).unwrap();
     let prop = node.get_property("rect").unwrap();
@@ -811,7 +849,7 @@ pub(super) async fn make(app: &App) {
         [0.4, 0.4, 0.4, 1.],
         &Rectangle { x: 0., y: 0., w: 1., h: 1. },
     );
-    let pimpl = Mesh::new(
+    let pimpl = VectorArt::new(
         app.ex.clone(),
         app.sg.clone(),
         node_id,
@@ -827,7 +865,7 @@ pub(super) async fn make(app: &App) {
     sg.link(node_id, layer_node_id).unwrap();
 
     // Create the chatview - editbox sep
-    let node_id = create_mesh(&mut sg, "chatview_bhs_sep");
+    let node_id = create_vector_art(&mut sg, "chatview_bhs_sep");
 
     let node = sg.get_node_mut(node_id).unwrap();
     let prop = node.get_property("rect").unwrap();
@@ -848,7 +886,7 @@ pub(super) async fn make(app: &App) {
         [0.4, 0.4, 0.4, 1.],
         &Rectangle { x: 0., y: 0., w: 1., h: 1. },
     );
-    let pimpl = Mesh::new(
+    let pimpl = VectorArt::new(
         app.ex.clone(),
         app.sg.clone(),
         node_id,

bin/darkwallet/src/scene.rs

@@ -41,7 +41,7 @@ pub enum SceneNodeType {
     Mouse = 8,
     RenderLayer = 3,
     RenderObject = 4,
-    RenderMesh = 5,
+    RenderVectorArt = 5,
     RenderText = 9,
     RenderTexture = 13,
     Fonts = 10,
@@ -662,7 +662,7 @@ pub enum Pimpl {
     Null,
     Window(ui::WindowPtr),
     RenderLayer(ui::RenderLayerPtr),
-    Mesh(ui::MeshPtr),
+    VectorArt(ui::VectorArtPtr),
     Text(ui::TextPtr),
     EditBox(ui::EditBoxPtr),
     ChatView(ui::ChatViewPtr),

bin/darkwallet/src/ui/layer.rs

@@ -140,7 +140,7 @@ impl RenderLayer {
 
             let dcs = match &node.pimpl {
                 Pimpl::RenderLayer(layer) => layer.draw(&sg, &rect).await,
-                Pimpl::Mesh(mesh) => mesh.draw(&sg, &rect),
+                Pimpl::VectorArt(svg) => svg.draw(&sg, &rect),
                 Pimpl::Text(txt) => txt.draw(&sg, &rect),
                 Pimpl::EditBox(editb) => editb.draw(&sg, &rect),
                 Pimpl::ChatView(chat) => chat.draw(&sg, &rect).await,

bin/darkwallet/src/ui/mod.rs

@@ -35,8 +35,8 @@ mod editbox;
 pub use editbox::{EditBox, EditBoxPtr};
 mod image;
 pub use image::{Image, ImagePtr};
-mod mesh;
-pub use mesh::{Mesh, MeshPtr};
+mod vector_art;
+pub use vector_art::{VectorArt, VectorArtPtr};
 mod layer;
 pub use layer::{RenderLayer, RenderLayerPtr};
 mod text;

bin/darkwallet/src/ui/mesh.rs → bin/darkwallet/src/ui/vector_art.rs

@@ -30,9 +30,9 @@ use crate::{
 
 use super::{eval_rect, get_parent_rect, read_rect, DrawUpdate, OnModify, Stoppable};
 
-pub type MeshPtr = Arc<Mesh>;
+pub type VectorArtPtr = Arc<VectorArt>;
 
-pub struct Mesh {
+pub struct VectorArt {
     sg: SceneGraphPtr2,
     render_api: RenderApiPtr,
     _tasks: Vec<smol::Task<()>>,
@@ -49,7 +49,7 @@ pub struct Mesh {
     z_index: PropertyUint32,
 }
 
-impl Mesh {
+impl VectorArt {
     pub async fn new(
         ex: ExecutorPtr,
         sg: SceneGraphPtr2,
@@ -88,7 +88,7 @@ impl Mesh {
             }
         });
 
-        Pimpl::Mesh(self_)
+        Pimpl::VectorArt(self_)
     }
 
     async fn redraw(self: Arc<Self>) {
@@ -156,7 +156,7 @@ impl Mesh {
     }
 }
 
-impl Stoppable for Mesh {
+impl Stoppable for VectorArt {
     async fn stop(&self) {
         // TODO: Delete own draw call