From e1ec307b3fd5021efc52edc10311590a8c244141 Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Fri, 8 May 2020 21:17:23 -0400 Subject: [PATCH] Switch to the embedded loader for the examples. --- examples/canvas_glutin_minimal/src/main.rs | 4 ++-- examples/canvas_metal_minimal/src/main.rs | 4 ++-- examples/canvas_moire/src/main.rs | 3 ++- examples/canvas_nanovg/src/main.rs | 4 ++-- examples/canvas_text/src/main.rs | 4 ++-- examples/swf_basic/src/main.rs | 4 ++-- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/examples/canvas_glutin_minimal/src/main.rs b/examples/canvas_glutin_minimal/src/main.rs index 747c57b2..58c5bfd0 100644 --- a/examples/canvas_glutin_minimal/src/main.rs +++ b/examples/canvas_glutin_minimal/src/main.rs @@ -20,7 +20,7 @@ use pathfinder_color::ColorF; use pathfinder_geometry::rect::RectF; use pathfinder_geometry::vector::{vec2f, vec2i}; use pathfinder_gl::{GLDevice, GLVersion}; -use pathfinder_resources::fs::FilesystemResourceLoader; +use pathfinder_resources::embedded::EmbeddedResourceLoader; use pathfinder_renderer::concurrent::rayon::RayonExecutor; use pathfinder_renderer::concurrent::scene_proxy::SceneProxy; use pathfinder_renderer::gpu::renderer::Renderer; @@ -49,7 +49,7 @@ fn main() { // Create a Pathfinder renderer. let mut renderer = Renderer::new(GLDevice::new(GLVersion::GL3, 0), - &FilesystemResourceLoader::locate(), + &EmbeddedResourceLoader, DestFramebuffer::full_window(window_size), RendererOptions { background_color: Some(ColorF::white()), diff --git a/examples/canvas_metal_minimal/src/main.rs b/examples/canvas_metal_minimal/src/main.rs index 275ca766..ced60d7e 100644 --- a/examples/canvas_metal_minimal/src/main.rs +++ b/examples/canvas_metal_minimal/src/main.rs @@ -20,7 +20,7 @@ use pathfinder_renderer::concurrent::scene_proxy::SceneProxy; use pathfinder_renderer::gpu::options::{DestFramebuffer, RendererOptions}; use pathfinder_renderer::gpu::renderer::Renderer; use pathfinder_renderer::options::BuildOptions; -use pathfinder_resources::fs::FilesystemResourceLoader; +use pathfinder_resources::embedded::EmbeddedResourceLoader; use sdl2::event::Event; use sdl2::hint; use sdl2::keyboard::Keycode; @@ -47,7 +47,7 @@ fn main() { // Create a Pathfinder renderer. let mut renderer = Renderer::new(MetalDevice::new(metal_layer), - &FilesystemResourceLoader::locate(), + &EmbeddedResourceLoader, DestFramebuffer::full_window(window_size), RendererOptions { background_color: Some(ColorF::white()) }); diff --git a/examples/canvas_moire/src/main.rs b/examples/canvas_moire/src/main.rs index dce7b317..36d452ea 100644 --- a/examples/canvas_moire/src/main.rs +++ b/examples/canvas_moire/src/main.rs @@ -18,7 +18,7 @@ use pathfinder_renderer::concurrent::scene_proxy::SceneProxy; use pathfinder_renderer::gpu::options::{DestFramebuffer, RendererOptions}; use pathfinder_renderer::gpu::renderer::Renderer; use pathfinder_renderer::options::BuildOptions; -use pathfinder_resources::fs::FilesystemResourceLoader; +use pathfinder_resources::embedded::EmbeddedResourceLoader; use std::f32::consts::PI; use std::f32; use surfman::{Connection, ContextAttributeFlags, ContextAttributes, GLVersion as SurfmanGLVersion}; @@ -87,6 +87,7 @@ fn main() { // Create our renderers. let renderer = Renderer::new(pathfinder_device, &FilesystemResourceLoader::locate(), + &EmbeddedResourceLoader, DestFramebuffer::full_window(framebuffer_size), RendererOptions { background_color: Some(ColorF::white()), diff --git a/examples/canvas_nanovg/src/main.rs b/examples/canvas_nanovg/src/main.rs index 0a238163..ffd08311 100644 --- a/examples/canvas_nanovg/src/main.rs +++ b/examples/canvas_nanovg/src/main.rs @@ -34,7 +34,7 @@ use pathfinder_renderer::gpu::options::{DestFramebuffer, RendererOptions}; use pathfinder_renderer::gpu::renderer::Renderer; use pathfinder_renderer::options::BuildOptions; use pathfinder_resources::ResourceLoader; -use pathfinder_resources::fs::FilesystemResourceLoader; +use pathfinder_resources::embedded::EmbeddedResourceLoader; use pathfinder_simd::default::F32x2; use std::collections::VecDeque; use std::f32::consts::PI; @@ -1501,7 +1501,7 @@ fn main() { let framebuffer_size = vec2i(physical_size.width as i32, physical_size.height as i32); // Load demo data. - let resources = FilesystemResourceLoader::locate(); + let resources = EmbeddedResourceLoader; let font_data = vec![ Handle::from_memory(Arc::new(resources.slurp("fonts/Roboto-Regular.ttf").unwrap()), 0), Handle::from_memory(Arc::new(resources.slurp("fonts/Roboto-Bold.ttf").unwrap()), 0), diff --git a/examples/canvas_text/src/main.rs b/examples/canvas_text/src/main.rs index 85603a35..8da632b5 100644 --- a/examples/canvas_text/src/main.rs +++ b/examples/canvas_text/src/main.rs @@ -19,7 +19,7 @@ use pathfinder_renderer::gpu::options::{DestFramebuffer, RendererOptions}; use pathfinder_renderer::gpu::renderer::Renderer; use pathfinder_renderer::options::BuildOptions; use pathfinder_resources::ResourceLoader; -use pathfinder_resources::fs::FilesystemResourceLoader; +use pathfinder_resources::embedded::EmbeddedResourceLoader; use sdl2::event::Event; use sdl2::keyboard::Keycode; use sdl2::video::GLProfile; @@ -49,7 +49,7 @@ fn main() { window.gl_make_current(&gl_context).unwrap(); // Create a Pathfinder renderer. - let resource_loader = FilesystemResourceLoader::locate(); + let resource_loader = EmbeddedResourceLoader; let mut renderer = Renderer::new(GLDevice::new(GLVersion::GL3, 0), &resource_loader, DestFramebuffer::full_window(window_size), diff --git a/examples/swf_basic/src/main.rs b/examples/swf_basic/src/main.rs index 239ddb53..19053489 100644 --- a/examples/swf_basic/src/main.rs +++ b/examples/swf_basic/src/main.rs @@ -18,7 +18,7 @@ use pathfinder_renderer::gpu::renderer::Renderer; use pathfinder_renderer::gpu::options::{DestFramebuffer, RendererOptions}; use pathfinder_renderer::options::{RenderTransform, BuildOptions}; use pathfinder_resources::ResourceLoader; -use pathfinder_resources::fs::FilesystemResourceLoader; +use pathfinder_resources::embedded::EmbeddedResourceLoader; use sdl2::event::Event; use sdl2::keyboard::Keycode; use sdl2::video::GLProfile; @@ -28,7 +28,7 @@ use std::env; use std::fs::read; fn main() { - let resource_loader = FilesystemResourceLoader::locate(); + let resource_loader = EmbeddedResourceLoader; let swf_bytes; if let Some(path) = env::args().skip(1).next() {