1 files changed, 41 insertions, 43 deletions

diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 38157d00..3cc1d3fb 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -1,6 +1,6 @@
 //! Draw meshes of triangles.
 use crate::Transformation;
-use iced_native::Rectangle;
+use iced_native::{Point, Rectangle};
 use std::{mem, sync::Arc};
 
 #[derive(Debug)]
@@ -91,7 +91,7 @@ impl Pipeline {
                     write_mask: wgpu::ColorWrite::ALL,
                 }],
                 depth_stencil_state: None,
-                index_format: wgpu::IndexFormat::Uint16,
+                index_format: wgpu::IndexFormat::Uint32,
                 vertex_buffers: &[wgpu::VertexBufferDescriptor {
                     stride: mem::size_of::<Vertex2D>() as u64,
                     step_mode: wgpu::InputStepMode::Vertex,
@@ -128,47 +128,28 @@ impl Pipeline {
         encoder: &mut wgpu::CommandEncoder,
         target: &wgpu::TextureView,
         transformation: Transformation,
-        scale: f32,
-        meshes: &Vec<Arc<Mesh2D>>,
+        meshes: &Vec<(Point, Arc<Mesh2D>)>,
         bounds: Rectangle<u32>,
     ) {
-        let uniforms = Uniforms {
-            transform: transformation.into(),
-            scale,
-        };
-
-        let constants_buffer = device
-            .create_buffer_mapped(1, wgpu::BufferUsage::COPY_SRC)
-            .fill_from_slice(&[uniforms]);
-
-        encoder.copy_buffer_to_buffer(
-            &constants_buffer,
-            0,
-            &self.constants_buffer,
-            0,
-            std::mem::size_of::<Uniforms>() as u64,
-        );
-
-        let mut render_pass =
-            encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
-                color_attachments: &[
-                    wgpu::RenderPassColorAttachmentDescriptor {
-                        attachment: target,
-                        resolve_target: None,
-                        load_op: wgpu::LoadOp::Load,
-                        store_op: wgpu::StoreOp::Store,
-                        clear_color: wgpu::Color {
-                            r: 0.0,
-                            g: 0.0,
-                            b: 0.0,
-                            a: 0.0,
-                        },
-                    },
-                ],
-                depth_stencil_attachment: None,
-            });
+        for (origin, mesh) in meshes {
+            let uniforms = Uniforms {
+                transform: (transformation
+                    * Transformation::translate(origin.x, origin.y))
+                .into(),
+            };
+
+            let constants_buffer = device
+                .create_buffer_mapped(1, wgpu::BufferUsage::COPY_SRC)
+                .fill_from_slice(&[uniforms]);
+
+            encoder.copy_buffer_to_buffer(
+                &constants_buffer,
+                0,
+                &self.constants_buffer,
+                0,
+                std::mem::size_of::<Uniforms>() as u64,
+            );
 
-        for mesh in meshes {
             let vertices_buffer = device
                 .create_buffer_mapped(
                     mesh.vertices.len(),
@@ -183,6 +164,25 @@ impl Pipeline {
                 )
                 .fill_from_slice(&mesh.indices);
 
+            let mut render_pass =
+                encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
+                    color_attachments: &[
+                        wgpu::RenderPassColorAttachmentDescriptor {
+                            attachment: target,
+                            resolve_target: None,
+                            load_op: wgpu::LoadOp::Load,
+                            store_op: wgpu::StoreOp::Store,
+                            clear_color: wgpu::Color {
+                                r: 0.0,
+                                g: 0.0,
+                                b: 0.0,
+                                a: 0.0,
+                            },
+                        },
+                    ],
+                    depth_stencil_attachment: None,
+                });
+
             render_pass.set_pipeline(&self.pipeline);
             render_pass.set_bind_group(0, &self.constants, &[]);
             render_pass.set_index_buffer(&indices_buffer, 0);
@@ -203,14 +203,12 @@ impl Pipeline {
 #[derive(Debug, Clone, Copy)]
 struct Uniforms {
     transform: [f32; 16],
-    scale: f32,
 }
 
 impl Default for Uniforms {
     fn default() -> Self {
         Self {
             transform: *Transformation::identity().as_ref(),
-            scale: 1.0,
         }
     }
 }
@@ -235,5 +233,5 @@ pub struct Mesh2D {
     /// The list of vertex indices that defines the triangles of the mesh.
     ///
     /// Therefore, this list should always have a length that is a multiple of 3.
-    pub indices: Vec<u16>,
+    pub indices: Vec<u32>,
 }