diff --git a/examples/graphicstest/src/main.rs b/examples/graphicstest/src/main.rs index 612809af2..2d3f2b57a 100644 --- a/examples/graphicstest/src/main.rs +++ b/examples/graphicstest/src/main.rs @@ -57,15 +57,12 @@ fn main() { let source_size = image.dimensions(); - let source_rect = - Rect::new(Point::new(0.0, 0.0), Size::new(source_size.0 as f32, source_size.1 as f32)); let dest_rect = Rect::new( Point::new(200.0, 200.0), Size::new(source_size.0 as f32, source_size.1 as f32), ); - let image_primitive = - rendering_primitives_builder.create_image_primitive(source_rect, dest_rect, image); + let image_primitive = rendering_primitives_builder.create_image_primitive(dest_rect, image); render_cache.allocate_entry(image_primitive) }; diff --git a/sixtyfps_runtime/corelib/graphics.rs b/sixtyfps_runtime/corelib/graphics.rs index 8c319e681..a07ca1b6c 100644 --- a/sixtyfps_runtime/corelib/graphics.rs +++ b/sixtyfps_runtime/corelib/graphics.rs @@ -60,7 +60,6 @@ pub trait RenderingPrimitivesBuilder { ) -> Self::RenderingPrimitive; fn create_image_primitive( &mut self, - source_rect: impl Into, dest_rect: impl Into, image: image::ImageBuffer, Vec>, ) -> Self::RenderingPrimitive; diff --git a/sixtyfps_runtime/corelib/item_rendering.rs b/sixtyfps_runtime/corelib/item_rendering.rs index 4ee06dfda..a2bf55873 100644 --- a/sixtyfps_runtime/corelib/item_rendering.rs +++ b/sixtyfps_runtime/corelib/item_rendering.rs @@ -45,7 +45,7 @@ pub(crate) fn update_item_rendering_data( ); let image_primitive = - rendering_primitives_builder.create_image_primitive(rect, rect, image); + rendering_primitives_builder.create_image_primitive(rect, image); rendering_data.cache_index = rendering_cache.allocate_entry(image_primitive); rendering_data.cache_ok = true; } diff --git a/sixtyfps_runtime/rendering_backends/gl/lib.rs b/sixtyfps_runtime/rendering_backends/gl/lib.rs index 1e78f471e..1056c63b1 100644 --- a/sixtyfps_runtime/rendering_backends/gl/lib.rs +++ b/sixtyfps_runtime/rendering_backends/gl/lib.rs @@ -472,18 +472,14 @@ impl RenderingPrimitivesBuilder for GLRenderingPrimitivesBuilder { fn create_image_primitive( &mut self, - source_rect: impl Into, dest_rect: impl Into, image: image::ImageBuffer, Vec>, ) -> Self::RenderingPrimitive { let rect = dest_rect.into(); - let src_rect = source_rect.into(); - let image_width = image.width() as f32; - let image_height = image.height() as f32; - let src_left = src_rect.min_x() / image_width; - let src_top = src_rect.min_y() / image_height; - let src_right = src_rect.max_x() / image_width; - let src_bottom = src_rect.max_y() / image_height; + let src_left = 0.; + let src_top = 0.; + let src_right = 1.; + let src_bottom = 1.; let vertex1 = Vertex { _pos: [rect.min_x(), rect.min_y()] }; let tex_vertex1 = Vertex { _pos: [src_left, src_top] };