From 9be5e251f33f55623ccf25263e9f29ad725c9b33 Mon Sep 17 00:00:00 2001 From: Matthew Blanchard Date: Wed, 10 Jan 2024 16:39:03 -0500 Subject: [PATCH] Removed warnings. Added missing flush call. --- src/editor/images.rs | 4 ++-- src/editor/util.rs | 16 ++++------------ src/main.rs | 1 - src/render/measure.rs | 14 +++++--------- src/system_fonts/mod.rs | 2 -- src/tool_behaviors/move_handle.rs | 3 --- src/tool_behaviors/move_tunni_line.rs | 6 +++--- src/tool_behaviors/move_tunni_point.rs | 11 +++++------ src/tool_behaviors/prelude.rs | 9 +++------ src/tools/cut.rs | 8 ++++---- src/tools/guidelines/dialog.rs | 8 ++++---- src/tools/measure.rs | 4 ---- src/tools/pap/dialog.rs | 8 ++++---- src/tools/pap/mod.rs | 4 ---- src/tools/pen/mod.rs | 2 +- src/tools/prelude.rs | 16 ++++------------ src/user_interface/gui/icons/mod.rs | 4 ++-- src/user_interface/gui/menu_bar.rs | 4 ++-- src/user_interface/gui/prompts.rs | 6 ++---- src/user_interface/gui/tool_bar.rs | 2 +- src/user_interface/gui/windows/grid_window.rs | 4 ++-- src/user_interface/gui/windows/mod.rs | 2 +- src/user_interface/mod.rs | 10 ++++------ src/user_interface/sdl.rs | 1 - 24 files changed, 53 insertions(+), 96 deletions(-) diff --git a/src/editor/images.rs b/src/editor/images.rs index bf432e9..cf2ede0 100644 --- a/src/editor/images.rs +++ b/src/editor/images.rs @@ -56,8 +56,8 @@ impl From for EditorImage { ); let image_info = SkImageInfo::from_color_info((width as i32, height as i32), color_info); let skdata = unsafe { SkData::new_bytes(&data) }; - let img = SkImage::from_raster_data(&image_info, skdata, (width * 4) as usize).unwrap(); - + let img = skia_safe::images::raster_from_data(&image_info, skdata, (width * 4) as usize).unwrap(); + Self { img, data, diff --git a/src/editor/util.rs b/src/editor/util.rs index da7279f..530b955 100644 --- a/src/editor/util.rs +++ b/src/editor/util.rs @@ -1,27 +1,19 @@ // This file is mainly utilities that are common use cases for the editor, but don't necessarily need to be // in Editor. -use std::collections::btree_set::Intersection; - use crate::{get_contour_len, get_point_mut}; -use crate::{ - get_point, - user_interface::{Interface, MouseInfo}, -}; -use egui::vec2; -use flo_curves::line::Line2D; +use crate::user_interface::Interface; use flo_curves::{ bezier::{solve_curve_for_t_along_axis, Curve as FloCurve}, geo::Coord2, - line::Line, }; -use glifparser::{MFEKPointData, Point, WhichHandle}; +use glifparser::WhichHandle; use glifrenderer::constants::{POINT_RADIUS, POINT_STROKE_THICKNESS}; use skia_safe::Contains; use skia_safe::Point as SkPoint; use skia_safe::Rect as SkRect; -use MFEKmath::{subdivide::Subdivide, vec2}; -use MFEKmath::{Bezier, Piecewise, Vector}; +use MFEKmath::subdivide::Subdivide; +use MFEKmath::{Bezier, Piecewise}; use super::Editor; use glifparser::glif::mfek::contour::MFEKContourCommon; diff --git a/src/main.rs b/src/main.rs index 7141284..3b7cbc4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,7 +5,6 @@ #![allow(incomplete_features)] #![feature( type_alias_impl_trait, - local_key_cell_methods, trait_alias, const_trait_impl, generic_const_exprs, diff --git a/src/render/measure.rs b/src/render/measure.rs index 00dad67..dc1b10d 100644 --- a/src/render/measure.rs +++ b/src/render/measure.rs @@ -2,12 +2,9 @@ use glifrenderer::constants::OUTLINE_STROKE_THICKNESS; use skia_safe::{Canvas, Font, Matrix, Paint, Path, Point, Rect}; use MFEKmath::{vec2, Vector}; -use crate::{ - constants, - editor::Editor, - tools::cut::{Cut, Intersection}, - user_interface::{Interface, MouseInfo}, -}; +use crate::editor::Editor; +use crate::tools::cut::{Cut, Intersection}; +use crate::user_interface::Interface; use glifrenderer::constants::MEASURE_STROKE; pub struct Measure { @@ -52,7 +49,6 @@ impl Measure { canvas.draw_path(&path, &paint); // Arc illustrating the angle - let radius = distance / 2.0; // This can be adjusted based on desired arc size. path.rewind(); // Clear the path to reuse it path.move_to(end_point_horizontal.to_skia_point()); @@ -98,7 +94,7 @@ impl Measure { factor, ); - let intersections = Cut::find_intersections(&self.start_point, &self.end_point, v, true); + let intersections = Cut::find_intersections(&self.start_point, &self.end_point, v); self.draw_intersection_distances(canvas, intersections.as_slice(), factor); if intersections.len() > 1 { @@ -112,7 +108,7 @@ impl Measure { last_intersection.coords.0 as f32, last_intersection.coords.1 as f32, ); - self.draw_bracket(canvas, fcoords, lcoords, -20.0, factor); // 20.0 is the offset from the main line, adjust as needed + self.draw_bracket(canvas, fcoords, lcoords, -20.0, factor); } } diff --git a/src/system_fonts/mod.rs b/src/system_fonts/mod.rs index 3f44334..65ba2c3 100644 --- a/src/system_fonts/mod.rs +++ b/src/system_fonts/mod.rs @@ -9,7 +9,6 @@ use font_kit::{ self as FKSelectionError, CannotAccessSource as FKSourceError, NotFound as FKNotFoundError, }, handle::Handle as FKHandle, - properties::Properties, source::SystemSource, }; @@ -51,7 +50,6 @@ impl TryInto for FKHandle { fn load_font(family: &[&str]) -> Result { log::debug!("Looking for a UI font to satisfy request for {:?}", family); let source = SystemSource::new(); - let props = Properties::new(); let mut font: Option = None; let mut last_err = None; let mut best_match; diff --git a/src/tool_behaviors/move_handle.rs b/src/tool_behaviors/move_handle.rs index cbf927d..7021135 100644 --- a/src/tool_behaviors/move_handle.rs +++ b/src/tool_behaviors/move_handle.rs @@ -17,8 +17,6 @@ pub struct MoveHandle { // this handle did not previously exist but is being drawn by user for the first time creating: bool, - - warned_force_line: bool, } // Event handlers @@ -28,7 +26,6 @@ impl MoveHandle { wh, mouse_info, creating, - warned_force_line: false, } } diff --git a/src/tool_behaviors/move_tunni_line.rs b/src/tool_behaviors/move_tunni_line.rs index b8ac203..35e0bbd 100644 --- a/src/tool_behaviors/move_tunni_line.rs +++ b/src/tool_behaviors/move_tunni_line.rs @@ -1,8 +1,8 @@ -use crate::{get_point_mut, editor::tunni::{TunniLineInfo, construct_tunni_line, get_tunni_line_from_info}}; +use crate::{get_point_mut, editor::tunni::{TunniLineInfo, get_tunni_line_from_info}}; use super::prelude::*; use MFEKmath::Vector; -use glifparser::glif::{mfek::contour::MFEKContourCommon}; +use glifparser::glif::mfek::contour::MFEKContourCommon; #[derive(Clone, Debug)] pub struct MoveTunniLine { mouse_info: MouseInfo, @@ -34,7 +34,7 @@ impl MoveTunniLine { } } - pub fn mouse_moved(&mut self, v: &mut Editor, i: &mut Interface, mouse_info: MouseInfo) { + pub fn mouse_moved(&mut self, v: &mut Editor, _: &mut Interface, mouse_info: MouseInfo) { // we stop the drag when there's no longer a well formed tunni point/line if get_tunni_line_from_info(v, &self.tunni_info).is_none() { v.pop_behavior(); diff --git a/src/tool_behaviors/move_tunni_point.rs b/src/tool_behaviors/move_tunni_point.rs index ae0c42f..ffde726 100644 --- a/src/tool_behaviors/move_tunni_point.rs +++ b/src/tool_behaviors/move_tunni_point.rs @@ -1,11 +1,11 @@ -use crate::{get_point_mut, editor::tunni::{TunniLineInfo, construct_tunni_line, get_tunni_line_from_info}}; +use crate::{get_point_mut, editor::tunni::{TunniLineInfo, get_tunni_line_from_info}}; use super::prelude::*; use MFEKmath::Vector; -use glifparser::glif::{mfek::contour::MFEKContourCommon}; +use glifparser::glif::mfek::contour::MFEKContourCommon; + #[derive(Clone, Debug)] pub struct MoveTunniPoint { - mouse_info: MouseInfo, tunni_info: TunniLineInfo } @@ -25,14 +25,13 @@ impl ToolBehavior for MoveTunniPoint { } impl MoveTunniPoint { - pub fn new(mouse_info: MouseInfo, tunni_info: TunniLineInfo) -> Self { + pub fn new(_: MouseInfo, tunni_info: TunniLineInfo) -> Self { MoveTunniPoint { - mouse_info, tunni_info } } - pub fn mouse_moved(&mut self, v: &mut Editor, i: &mut Interface, mouse_info: MouseInfo) { + pub fn mouse_moved(&mut self, v: &mut Editor, _: &mut Interface, mouse_info: MouseInfo) { // we stop the drag when there's no longer a well formed tunni point/line if get_tunni_line_from_info(v, &self.tunni_info).is_none() { v.pop_behavior(); diff --git a/src/tool_behaviors/prelude.rs b/src/tool_behaviors/prelude.rs index 06bdac1..c7c8d23 100644 --- a/src/tool_behaviors/prelude.rs +++ b/src/tool_behaviors/prelude.rs @@ -7,25 +7,22 @@ pub use crate::editor::util::*; pub use crate::editor::Editor; // Renderer -pub use glifrenderer::constants::*; pub use glifrenderer::points::draw_point; -pub use glifrenderer::points::UIPointType; pub use glifrenderer::viewport::Viewport; // Input pub use sdl2::mouse::MouseButton; // Util + Macros -pub use crate::util::*; -pub use crate::{get_contour, get_contour_len, get_contour_mut, is_contour_open, get_point}; +pub use crate::{get_contour, get_contour_mut, get_point}; // Skia/Winit stuff pub use skia_safe::Contains as _; pub use skia_safe::{ - Canvas, IPoint as SkIPoint, Matrix, Path as SkPath, Point as SkPoint, Rect as SkRect, + Canvas, Matrix, Point as SkPoint, Rect as SkRect, }; -pub use glifparser::{glif::MFEKGlif, Contour, Handle, Outline, Point, PointType, WhichHandle}; +pub use glifparser::{glif::MFEKGlif, Handle, WhichHandle}; //User interface pub use crate::command::CommandMod; diff --git a/src/tools/cut.rs b/src/tools/cut.rs index 6331689..34f2151 100644 --- a/src/tools/cut.rs +++ b/src/tools/cut.rs @@ -15,7 +15,7 @@ use glifparser::glif::contour::MFEKContourCommon; use glifrenderer::constants::{self, OUTLINE_STROKE_THICKNESS}; use kurbo::{PathSeg, QuadBez, ParamCurve}; use skia_safe::{Canvas, Paint, Path, Point}; -use MFEKmath::{Piecewise, Bezier, Evaluate}; +use MFEKmath::{Piecewise, Bezier}; use crate::editor::Editor; use crate::user_interface::Interface; @@ -62,12 +62,12 @@ impl Cut { } fn mouse_released(&mut self, v: &mut Editor, mouse_info: MouseInfo) { - let intersections = Self::find_intersections(&self.start_point, &Some(mouse_info.position.into()), v, false); + let intersections = Self::find_intersections(&self.start_point, &Some(mouse_info.position.into()), v); Self::split_at_intersections(v, &intersections); self.start_point = None; } - pub fn find_intersections(start_point: &Option<(f32, f32)>, end_point: &Option<(f32, f32)>, v: &Editor, non_cubic: bool) -> Vec { + pub fn find_intersections(start_point: &Option<(f32, f32)>, end_point: &Option<(f32, f32)>, v: &Editor) -> Vec { let mut intersections = vec![]; if start_point.is_none() || end_point.is_none() { return intersections } @@ -281,7 +281,7 @@ impl Cut { canvas.draw_path(&path, &paint); // Draw X's at the intersections - let intersections = Self::find_intersections(&start_point, &end_point, v, true); // Assuming you have access to the editor here + let intersections = Self::find_intersections(&start_point, &end_point, v); // Assuming you have access to the editor here for intersection in intersections { let intersection_point = Point::new(intersection.coords.0 as f32, intersection.coords.1 as f32); diff --git a/src/tools/guidelines/dialog.rs b/src/tools/guidelines/dialog.rs index dcbae92..c515565 100644 --- a/src/tools/guidelines/dialog.rs +++ b/src/tools/guidelines/dialog.rs @@ -11,13 +11,13 @@ lazy_static! { impl Guidelines { pub fn tool_dialog(&mut self, v: &mut Editor, i: &mut Interface, ui: &mut egui::Ui) { - let (mut guidelines, _, local_guidelines_len, _) = SplitGuidelines::new(v).as_tuple(); + let (mut guidelines, _, _, _) = SplitGuidelines::new(v).as_tuple(); for (gidx, (guideline, is_global)) in guidelines.iter_mut().enumerate() { ui.vertical(|ui| { ui.horizontal(|ui| { let ( - mut guidelines, + guidelines, _guidelines_len, local_guidelines_len, _global_guidelines_len, @@ -85,7 +85,7 @@ impl Guidelines { }); let guideline_display = guideline_name.clone(); - let mut im_str = guideline_display; + let im_str = guideline_display; if !(is_global && guideline.data.as_guideline().format) { let rb = build_and_add_icon_button::<"icons_small">(v, ui, icons::_RENAME, "Rename guideline"); @@ -140,7 +140,7 @@ impl Guidelines { return; } - let (mut at, mut angle) = { + let (at, angle) = { let at = guidelines[selected].0.at; let angle = guidelines[selected].0.angle.into(); diff --git a/src/tools/measure.rs b/src/tools/measure.rs index e5a584e..9325e41 100644 --- a/src/tools/measure.rs +++ b/src/tools/measure.rs @@ -1,9 +1,5 @@ -use glifrenderer::constants; -use skia_safe::{Point, Color4f, Typeface, Font}; - use crate::editor::Editor; use crate::tool_behaviors::zoom_scroll::ZoomScroll; -use crate::tools::cut::{Cut, Intersection}; use crate::user_interface::Interface; use super::prelude::*; diff --git a/src/tools/pap/dialog.rs b/src/tools/pap/dialog.rs index dfc7cd8..af86356 100644 --- a/src/tools/pap/dialog.rs +++ b/src/tools/pap/dialog.rs @@ -1,6 +1,6 @@ use super::super::prelude::*; use super::PAP; -use crate::user_interface::{Interface, gui::windows::egui_parsed_textfield}; +use crate::user_interface::Interface; use glifparser::glif::contour_operations::{pap::{PatternStretch, PatternCopies, PatternSubdivide, PAPContour, PatternCulling}, ContourOperations}; use egui::Ui; @@ -63,7 +63,7 @@ impl PAP { } data.subdivide = match data.subdivide { - PatternSubdivide::Simple(mut times) => { + PatternSubdivide::Simple(times) => { let mut times = times as i32; ui.add(egui::Slider::new(&mut times, 1..=10) .text("Times") @@ -71,7 +71,7 @@ impl PAP { PatternSubdivide::Simple(times as usize) } - PatternSubdivide::Angle(mut angle) => { + PatternSubdivide::Angle(angle) => { let mut angle = angle as f32; ui.add(egui::Slider::new(&mut angle, 0.0..=90.0) .text("Angle") @@ -108,7 +108,7 @@ impl PAP { } data.prevent_overdraw = match data.prevent_overdraw { - PatternCulling::EraseOverlapping(mut radius, mut cull_area_percent) => { + PatternCulling::EraseOverlapping(radius, mut cull_area_percent) => { let mut radius = radius as f32; ui.add(egui::Slider::new(&mut radius, 0.0..=20.0) .text("Radius") diff --git a/src/tools/pap/mod.rs b/src/tools/pap/mod.rs index 9a87745..c95f152 100644 --- a/src/tools/pap/mod.rs +++ b/src/tools/pap/mod.rs @@ -1,7 +1,5 @@ mod dialog; -use std::collections::HashMap; - use super::prelude::*; use crate::tool_behaviors::zoom_scroll::ZoomScroll; use crate::tools::Select; @@ -10,7 +8,6 @@ use crate::editor::Editor; #[derive(Clone, Debug)] pub struct PAP { pattern_layer: Option, - edit_buf: HashMap, select_tool: Select } @@ -48,7 +45,6 @@ impl Tool for PAP { impl PAP { pub fn new() -> Self { Self { - edit_buf: HashMap::new(), pattern_layer: None, select_tool: Select::new() } diff --git a/src/tools/pen/mod.rs b/src/tools/pen/mod.rs index 48cfbf5..f0cfdef 100644 --- a/src/tools/pen/mod.rs +++ b/src/tools/pen/mod.rs @@ -193,7 +193,7 @@ impl Pen { let selected_open = is_contour_open!(v.get_active_layer_ref(), c_idx); let target_open = is_contour_open!(v.get_active_layer_ref(), info_ci); if end_is_active && start_is_clicked && selected_open && target_open { - let point = get_contour!(v.get_active_layer_ref(), info_ci).get_point(p_idx).unwrap().clone(); + let point = get_contour!(v.get_active_layer_ref(), info_ci).get_point(p_idx).unwrap(); draw_point( &i.viewport, point, diff --git a/src/tools/prelude.rs b/src/tools/prelude.rs index 91b649f..f6e5006 100644 --- a/src/tools/prelude.rs +++ b/src/tools/prelude.rs @@ -12,25 +12,17 @@ pub use crate::editor::util::*; pub use crate::editor::Editor; // Util + Macros -pub use crate::util::*; -pub use crate::{get_contour, get_contour_len, get_contour_mut, is_contour_open, get_point}; +pub use crate::{get_contour, get_contour_len, get_contour_mut}; // Skia/Winit stuff pub use skia_safe::Contains as _; pub use skia_safe::{ - Canvas, IPoint as SkIPoint, Matrix, Path as SkPath, Point as SkPoint, Rect as SkRect, + Canvas, Point as SkPoint, Rect as SkRect, }; -pub use skia_safe::{Paint, PaintStyle, Path, Rect}; - -pub use glifparser::{Contour, Handle, Outline, Point, PointType, WhichHandle}; - -// std -pub use std::cell::RefCell; -pub use std::mem; +pub use skia_safe::{Paint, PaintStyle}; +pub use glifparser::WhichHandle; //UI -pub use crate::command::CommandMod; -pub use crate::user_interface::gui; pub use crate::user_interface::{Interface, MouseInfo}; pub use egui::Ui; pub use sdl2::mouse::MouseButton; diff --git a/src/user_interface/gui/icons/mod.rs b/src/user_interface/gui/icons/mod.rs index 30c0cd9..dba5d5f 100644 --- a/src/user_interface/gui/icons/mod.rs +++ b/src/user_interface/gui/icons/mod.rs @@ -34,8 +34,8 @@ pub const _GRID: &str = "\u{F029}"; pub const GUIDELINES: &str = "\u{F030}"; pub const HYPERBEZIER: &str = "\u{F031}"; pub const QUADRATIC: &str = "\u{F032}"; -pub const BSPLINE: &str = "\u{F033}"; -pub const SPIRO: &str = "\u{F034}"; +//pub const BSPLINE: &str = "\u{F033}"; +//pub const SPIRO: &str = "\u{F034}"; pub const DASH: &str = "\u{F035}"; pub const _GLOBE: &str = "\u{F036}"; pub const _UFO: &str = "\u{F037}"; diff --git a/src/user_interface/gui/menu_bar.rs b/src/user_interface/gui/menu_bar.rs index 55f5f51..50c8cff 100644 --- a/src/user_interface/gui/menu_bar.rs +++ b/src/user_interface/gui/menu_bar.rs @@ -19,10 +19,10 @@ pub fn menu_bar(ctx: &Context, v: &mut Editor, i: &mut Interface, wm: &mut Windo }; } if ui.button("Save").clicked() { - v.save_glif(false); + v.save_glif(false).expect("Error while saving file."); } if ui.button("Export").clicked() { - v.export_glif(Some(i)); + v.export_glif(Some(i)).expect("Error while exporting glif."); } if ui.button("Exit").clicked() { v.quit(i); diff --git a/src/user_interface/gui/prompts.rs b/src/user_interface/gui/prompts.rs index 5ebf830..fbe1551 100644 --- a/src/user_interface/gui/prompts.rs +++ b/src/user_interface/gui/prompts.rs @@ -1,5 +1,3 @@ -use std::borrow::BorrowMut; - use egui::Align2; //use super::{IMGUI_RESERVE, PROMPT_CLR, PROMPT_STR, TOOLBOX_HEIGHT, TOOLBOX_WIDTH}; @@ -12,7 +10,7 @@ pub fn build_and_check_prompts(v: &mut Editor, i: &mut Interface, ctx: &egui::Co match i.peek_prompt().clone() { InputPrompt::YesNo { question, - afterword, + afterword: _, func, } => { egui::Window::new("MFEKglif") @@ -43,7 +41,7 @@ pub fn build_and_check_prompts(v: &mut Editor, i: &mut Interface, ctx: &egui::Co } InputPrompt::Text { label, - default, + default: _, func, } => { egui::Window::new(label) diff --git a/src/user_interface/gui/tool_bar.rs b/src/user_interface/gui/tool_bar.rs index f3a60bb..8912921 100644 --- a/src/user_interface/gui/tool_bar.rs +++ b/src/user_interface/gui/tool_bar.rs @@ -24,7 +24,7 @@ fn build_button<'a>(v: &mut Editor, ui: &mut Ui, text: &str, te: ToolEnum) { Stroke::NONE }; - let mut button = b.button.unwrap().stroke(stroke); + let button = b.button.unwrap().stroke(stroke); b.button = Some(button); let response = b.egui_response(ui); diff --git a/src/user_interface/gui/windows/grid_window.rs b/src/user_interface/gui/windows/grid_window.rs index b5c9b48..df5d4a5 100644 --- a/src/user_interface/gui/windows/grid_window.rs +++ b/src/user_interface/gui/windows/grid_window.rs @@ -74,8 +74,8 @@ impl GlifWindow for GridWindow { &mut self.edit_buf, )); - let mut angle = (f32::to_degrees(f32::atan(slope)) * 10000.).round() / 10000.; - angle = egui_parsed_textfield(ui, "spacing", angle, &mut self.edit_buf); + let angle = (f32::to_degrees(f32::atan(slope)) * 10000.).round() / 10000.; + egui_parsed_textfield(ui, "spacing", angle, &mut self.edit_buf); } i.grid.offset %= i.grid.spacing; diff --git a/src/user_interface/gui/windows/mod.rs b/src/user_interface/gui/windows/mod.rs index 39e45c1..f28f066 100644 --- a/src/user_interface/gui/windows/mod.rs +++ b/src/user_interface/gui/windows/mod.rs @@ -1,4 +1,4 @@ -use std::{default, str::FromStr}; +use std::str::FromStr; use egui::Ui; diff --git a/src/user_interface/mod.rs b/src/user_interface/mod.rs index 0bced9a..e27aaa0 100644 --- a/src/user_interface/mod.rs +++ b/src/user_interface/mod.rs @@ -15,12 +15,11 @@ use glifrenderer::viewport::Viewport; use sdl2::video::GLContext; use skia_bindings::GrDirectContext; use skia_bindings::GrSurfaceOrigin; +use skia_safe::gpu; use skia_safe::gpu::gl::FramebufferInfo; -use skia_safe::gpu::BackendRenderTarget; use skia_safe::Color; use skia_safe::ColorType; use skia_safe::RCHandle; -use skia_safe::Surface; use crate::editor::Editor; pub use crate::render::measure::Measure; @@ -31,7 +30,7 @@ use sdl2::{video::Window as SdlWindow, Sdl}; use self::egui_manager::EguiManager; use self::gui::build_ui; use self::gui::window::WindowManager; -pub use self::popout::{Popout, PopoutWindow}; +pub use self::popout::PopoutWindow; /* Window */ pub const PAPER_DRAW_GUIDELINES: bool = false; @@ -199,7 +198,6 @@ impl Interface { } pub fn windows(&mut self) -> impl IntoIterator { - use std::slice::IterMut; (Box::new([&mut self.sdl_window]) .into_iter() .chain(&mut self.child_sdl_windows) @@ -221,8 +219,8 @@ fn create_surface( let (width, height) = window.drawable_size(); let backend_render_target = - BackendRenderTarget::new_gl((width as i32, height as i32), 0, 8, *fb_info); - Surface::from_backend_render_target( + gpu::backend_render_targets::make_gl((width as i32, height as i32), 0, 8, *fb_info); + gpu::surfaces::wrap_backend_render_target( gr_context, &backend_render_target, GrSurfaceOrigin::BottomLeft, diff --git a/src/user_interface/sdl.rs b/src/user_interface/sdl.rs index 864c719..be7bd6a 100644 --- a/src/user_interface/sdl.rs +++ b/src/user_interface/sdl.rs @@ -92,7 +92,6 @@ impl Interface { (sdl_context, window, gr_context, gl_ctx) } - fn create_gl_context(&mut self) {} pub fn set_window_title(&mut self, title: &str) -> Result<(), NulError> { self.sdl_window.set_title(title)