From 578ea4abb8a2dd0d53d7087322796bf9ad541b56 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 12 Feb 2020 08:49:42 +0100
Subject: Finish `clock` example

---
 wgpu/src/renderer.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'wgpu/src/renderer.rs')

diff --git a/wgpu/src/renderer.rs b/wgpu/src/renderer.rs
index e93090b8..25b2e99a 100644
--- a/wgpu/src/renderer.rs
+++ b/wgpu/src/renderer.rs
@@ -26,7 +26,7 @@ struct Layer<'a> {
     offset: Vector<u32>,
     quads: Vec<Quad>,
     images: Vec<Image>,
-    meshes: Vec<Arc<triangle::Mesh2D>>,
+    meshes: Vec<(Point, Arc<triangle::Mesh2D>)>,
     text: Vec<wgpu_glyph::Section<'a>>,
 }
 
@@ -229,8 +229,8 @@ impl Renderer {
                     scale: [bounds.width, bounds.height],
                 });
             }
-            Primitive::Mesh2D(mesh) => {
-                layer.meshes.push(mesh.clone());
+            Primitive::Mesh2D { origin, buffers } => {
+                layer.meshes.push((*origin, buffers.clone()));
             }
             Primitive::Clip {
                 bounds,
@@ -313,9 +313,10 @@ impl Renderer {
 
         if layer.meshes.len() > 0 {
             let translated = transformation
+                * Transformation::scale(scale_factor, scale_factor)
                 * Transformation::translate(
-                    -(layer.offset.x as f32) * scale_factor,
-                    -(layer.offset.y as f32) * scale_factor,
+                    -(layer.offset.x as f32),
+                    -(layer.offset.y as f32),
                 );
 
             self.triangle_pipeline.draw(
@@ -323,7 +324,6 @@ impl Renderer {
                 encoder,
                 target,
                 translated,
-                scale_factor,
                 &layer.meshes,
                 bounds,
             );
-- 
cgit 


From dadae122533ae0916bebd04d6efab3de145263d4 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 15 Feb 2020 10:08:27 +0100
Subject: Implement MSAA for `triangle` pipeline in `iced_wgpu`

---
 wgpu/src/renderer.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'wgpu/src/renderer.rs')

diff --git a/wgpu/src/renderer.rs b/wgpu/src/renderer.rs
index 25b2e99a..29adcfb6 100644
--- a/wgpu/src/renderer.rs
+++ b/wgpu/src/renderer.rs
@@ -51,7 +51,8 @@ impl Renderer {
         let text_pipeline = text::Pipeline::new(device, settings.default_font);
         let quad_pipeline = quad::Pipeline::new(device);
         let image_pipeline = crate::image::Pipeline::new(device);
-        let triangle_pipeline = triangle::Pipeline::new(device);
+        let triangle_pipeline =
+            triangle::Pipeline::new(device, settings.antialiasing);
 
         Self {
             quad_pipeline,
@@ -105,6 +106,8 @@ impl Renderer {
                 &layer,
                 encoder,
                 target.texture,
+                width,
+                height,
             );
         }
 
@@ -308,6 +311,8 @@ impl Renderer {
         layer: &Layer<'_>,
         encoder: &mut wgpu::CommandEncoder,
         target: &wgpu::TextureView,
+        target_width: u32,
+        target_height: u32,
     ) {
         let bounds = layer.bounds * scale_factor;
 
@@ -323,6 +328,8 @@ impl Renderer {
                 device,
                 encoder,
                 target,
+                target_width,
+                target_height,
                 translated,
                 &layer.meshes,
                 bounds,
-- 
cgit