add examples for rect and text, refactor sugarloaf and remove custom …

…renderer
raphamorim · May 12, 2023 · dd6dd28 · dd6dd28
1 parent 245852b
commit dd6dd28
Show file tree

Hide file tree

Showing 13 changed files with 231 additions and 189 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rio/Cargo.toml b/rio/Cargo.toml
@@ -14,7 +14,6 @@ tokio = { version = "1.26.0", features = ["full"] }
 winit = { workspace = true }
 libc = "0.2.141"
 image = { version = "0.24.5", default-features = false, features = ["ico"] }
-glam = "0.21.3"
 bytemuck = { workspace = true }
 mio = "0.6.20"
 base64 = "0.21.0"

diff --git a/rio/src/layout/mod.rs b/rio/src/layout/mod.rs
@@ -3,7 +3,7 @@ mod mouse;
 use crate::crosswords::grid::Dimensions;
 use crate::crosswords::{MIN_COLUMNS, MIN_VISIBLE_ROWS};
 use mouse::{AccumulatedScroll, Mouse};
-use sugarloaf::SugarloafStyle;
+use sugarloaf::core::SugarloafStyle;
 
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
 pub struct Delta<T: Default> {

diff --git a/rio/src/screen/state.rs b/rio/src/screen/state.rs
@@ -180,7 +180,7 @@ impl State {
         rows: Vec<Row<Square>>,
         cursor: (pos::Column, pos::Line),
         sugarloaf: &mut Sugarloaf,
-        style: sugarloaf::SugarloafStyle,
+        style: sugarloaf::core::SugarloafStyle,
     ) {
         self.cursor.position = cursor;
         for (i, row) in rows.iter().enumerate() {

diff --git a/sugarloaf/examples/row.rs → sugarloaf/examples/rect.rs b/sugarloaf/examples/row.rs → sugarloaf/examples/rect.rs
@@ -8,36 +8,35 @@ use winit::{
     window::WindowBuilder,
 };
 
-use sugarloaf::components::row::Row;
-use sugarloaf::{CustomRenderer, Renderable, RendererTarget};
+use sugarloaf::components::rect::Rect;
+use sugarloaf::{RendererTarget, Sugarloaf};
 
 #[tokio::main]
 async fn main() {
     let mut event_loop = EventLoop::new();
 
     let window = WindowBuilder::new()
-        .with_title("Row example")
+        .with_title("Rect example")
         .with_inner_size(LogicalSize::new(1200.0, 800.0))
         .with_resizable(true)
         .build(&event_loop)
         .unwrap();
 
-    let mut renderer = CustomRenderer::new(
+    let mut sugarloaf = Sugarloaf::new(
         RendererTarget::Desktop,
         &window,
         wgpu::PowerPreference::HighPerformance,
+        "Firamono".to_string(),
     )
-    .await;
-    let mut row = Row::init(renderer.get_context());
-    renderer.add_component(&mut row);
+    .await
+    .expect("Sugarloaf instance should be created");
 
     event_loop.run_return(move |event, _, control_flow| {
         control_flow.set_wait();
 
         match event {
             Event::Resumed => {
-                // renderer.add_component(&mut rect);
-                // window.request_redraw();
+                window.request_redraw();
             }
             Event::WindowEvent { event, .. } => match event {
                 WindowEvent::CloseRequested => control_flow.set_exit(),
@@ -57,15 +56,43 @@ async fn main() {
                     scale_factor,
                     ..
                 } => {
-                    renderer
+                    sugarloaf
                         .rescale(scale_factor as f32)
                         .resize(new_inner_size.width, new_inner_size.height)
-                        .render();
+                        .render(wgpu::Color::BLUE);
                 }
                 _ => (),
             },
             Event::RedrawRequested { .. } => {
-                renderer.render();
+                sugarloaf
+                    .pile_rect(vec![
+                        Rect {
+                            position: [10.0, 10.0],
+                            color: [1.0, 1.0, 1.0, 1.0],
+                            size: [1.0, 1.0],
+                        },
+                        Rect {
+                            position: [15.0, 10.0],
+                            color: [1.0, 1.0, 1.0, 1.0],
+                            size: [10.0, 10.0],
+                        },
+                        Rect {
+                            position: [30.0, 20.0],
+                            color: [1.0, 1.0, 0.0, 1.0],
+                            size: [50.0, 50.0],
+                        },
+                        Rect {
+                            position: [200., 200.0],
+                            color: [0.0, 1.0, 0.0, 1.0],
+                            size: [100.0, 100.0],
+                        },
+                        Rect {
+                            position: [500.0, 200.0],
+                            color: [1.0, 1.0, 0.0, 1.0],
+                            size: [200.0, 200.0],
+                        },
+                    ])
+                    .render(wgpu::Color::BLUE);
             }
             _ => {
                 *control_flow = winit::event_loop::ControlFlow::Wait;

diff --git a/sugarloaf/examples/text.rs b/sugarloaf/examples/text.rs
@@ -0,0 +1,141 @@
+extern crate tokio;
+
+use winit::platform::run_return::EventLoopExtRunReturn;
+use winit::{
+    dpi::LogicalSize,
+    event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
+    event_loop::EventLoop,
+    window::WindowBuilder,
+};
+
+use sugarloaf::core::{Sugar, SugarloafStyle};
+use sugarloaf::{RendererTarget, Sugarloaf};
+
+#[tokio::main]
+async fn main() {
+    let mut event_loop = EventLoop::new();
+    let width = 1200.0;
+    let height = 800.0;
+
+    let window = WindowBuilder::new()
+        .with_title("Text example")
+        .with_inner_size(LogicalSize::new(1200.0, 800.0))
+        .with_resizable(true)
+        .build(&event_loop)
+        .unwrap();
+
+    let mut sugarloaf = Sugarloaf::new(
+        RendererTarget::Desktop,
+        &window,
+        wgpu::PowerPreference::HighPerformance,
+        "Firamono".to_string(),
+    )
+    .await
+    .expect("Sugarloaf instance should be created");
+
+    event_loop.run_return(move |event, _, control_flow| {
+        control_flow.set_wait();
+
+        match event {
+            Event::Resumed => {
+                window.request_redraw();
+            }
+            Event::WindowEvent { event, .. } => match event {
+                WindowEvent::CloseRequested => control_flow.set_exit(),
+                WindowEvent::KeyboardInput {
+                    input:
+                        KeyboardInput {
+                            virtual_keycode: Some(VirtualKeyCode::Space),
+                            state: ElementState::Released,
+                            ..
+                        },
+                    ..
+                } => {
+                    //
+                }
+                WindowEvent::ScaleFactorChanged {
+                    new_inner_size,
+                    scale_factor,
+                    ..
+                } => {
+                    sugarloaf
+                        .rescale(scale_factor as f32)
+                        .resize(new_inner_size.width, new_inner_size.height)
+                        .render(wgpu::Color::BLACK);
+                }
+                _ => (),
+            },
+            Event::RedrawRequested { .. } => {
+                let sugar = vec![
+                    Sugar {
+                        content: 'S',
+                        foreground_color: [1.0, 1.0, 1.0, 1.0],
+                        background_color: [0.0, 0.0, 0.0, 1.0],
+                    },
+                    Sugar {
+                        content: 'u',
+                        foreground_color: [0.0, 0.0, 0.0, 1.0],
+                        background_color: [0.0, 0.0, 0.0, 1.0],
+                    },
+                    Sugar {
+                        content: 'g',
+                        foreground_color: [1.0, 1.0, 1.0, 1.0],
+                        background_color: [0.0, 0.0, 0.0, 1.0],
+                    },
+                    Sugar {
+                        content: 'a',
+                        foreground_color: [0.0, 0.0, 0.0, 1.0],
+                        background_color: [0.0, 0.0, 0.0, 1.0],
+                    },
+                    Sugar {
+                        content: 'r',
+                        foreground_color: [1.0, 1.0, 1.0, 1.0],
+                        background_color: [0.0, 0.0, 0.0, 1.0],
+                    },
+                ];
+
+                let loaf = vec![
+                    Sugar {
+                        content: 'l',
+                        foreground_color: [1.0, 1.0, 1.0, 1.0],
+                        background_color: [0.0, 0.0, 0.0, 1.0],
+                    },
+                    Sugar {
+                        content: 'o',
+                        foreground_color: [0.0, 0.0, 0.0, 1.0],
+                        background_color: [0.0, 0.0, 0.0, 1.0],
+                    },
+                    Sugar {
+                        content: 'a',
+                        foreground_color: [1.0, 1.0, 1.0, 1.0],
+                        background_color: [0.0, 0.0, 0.0, 1.0],
+                    },
+                    Sugar {
+                        content: 'f',
+                        foreground_color: [0.0, 0.0, 0.0, 1.0],
+                        background_color: [0.0, 0.0, 0.0, 1.0],
+                    },
+                ];
+
+                let scale_factor = 2.;
+                let font_size = 150.;
+
+                let style = SugarloafStyle {
+                    screen_position: (
+                        (20. + 10.) * scale_factor,
+                        (20. + font_size) * scale_factor,
+                    ),
+                    text_scale: font_size * scale_factor,
+                    bounds: (width * scale_factor, height * scale_factor),
+                };
+
+                sugarloaf.stack(sugar, style);
+                sugarloaf.stack(loaf, style);
+                sugarloaf.render(wgpu::Color::RED);
+            }
+            _ => {
+                *control_flow = winit::event_loop::ControlFlow::Wait;
+            }
+        }
+    });
+}
diff --git a/sugarloaf/src/components/mod.rs b/sugarloaf/src/components/mod.rs
@@ -1,2 +1,2 @@
-pub mod row;
+pub mod rect;
 pub mod text;
diff --git a/sugarloaf/src/components/row/mod.rs → sugarloaf/src/components/rect/mod.rs b/sugarloaf/src/components/row/mod.rs → sugarloaf/src/components/rect/mod.rs
@@ -95,7 +95,7 @@ pub const BLEND: Option<wgpu::BlendState> = Some(wgpu::BlendState {
     },
 });
 
-pub struct Row {
+pub struct RectBrush {
     vertex_buf: wgpu::Buffer,
     index_buf: wgpu::Buffer,
     instances: wgpu::Buffer,
@@ -107,7 +107,7 @@ pub struct Row {
     scale: f32,
 }
 
-impl Renderable for Row {
+impl Renderable for RectBrush {
     fn init(context: &Context) -> Self {
         let device = &context.device;
         let vertex_data = create_vertices_rect();
@@ -231,7 +231,7 @@ impl Renderable for Row {
         });
 
         // Done
-        Row {
+        RectBrush {
             scale: 1.0,
             vertex_buf,
             index_buf,

diff --git a/sugarloaf/src/components/row/rect.wgsl → sugarloaf/src/components/rect/rect.wgsl b/sugarloaf/src/components/row/rect.wgsl → sugarloaf/src/components/rect/rect.wgsl
diff --git a/sugarloaf/src/components/text/mod.rs b/sugarloaf/src/components/text/mod.rs
@@ -178,16 +178,6 @@ where
                         suggested
                     };
 
-                    // if log_enabled!(log::Level::Warn) {
-                    //     warn!(
-                    //         "Increasing glyph texture size {old:?} -> {new:?}. \
-                    //          Consider building with `.initial_cache_size({new:?})` to avoid \
-                    //          resizing",
-                    //         old = self.glyph_brush.texture_dimensions(),
-                    //         new = (new_width, new_height),
-                    //     );
-                    // }
-
                     pipeline.increase_cache_size(device, new_width, new_height);
                     self.glyph_brush.resize_texture(new_width, new_height);
                 }

diff --git a/sugarloaf/src/core.rs b/sugarloaf/src/core.rs
@@ -7,6 +7,13 @@ pub struct Sugar {
 pub type SugarStack = Vec<Sugar>;
 pub type SugarPile = Vec<SugarStack>;
 
+#[derive(Copy, Default, Debug, Clone)]
+pub struct SugarloafStyle {
+    pub screen_position: (f32, f32),
+    pub bounds: (f32, f32),
+    pub text_scale: f32,
+}
+
 pub fn empty_sugar_pile() -> SugarPile {
     vec![vec![]]
 }
diff --git a/sugarloaf/src/lib.rs b/sugarloaf/src/lib.rs
@@ -5,6 +5,4 @@ mod font;
 mod sugarloaf;
 mod tools;
 
-pub use crate::sugarloaf::{
-    CustomRenderer, Renderable, RendererTarget, Sugarloaf, SugarloafStyle,
-};
+pub use crate::sugarloaf::{Renderable, RendererTarget, Sugarloaf};