michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #330 from frewsxcv/frewsxcv-embedded 

Switch to the embedded loader for the examples.
This commit is contained in:
Patrick Walton 2020-05-10 21:33:04 -07:00 committed by GitHub
parent aa1279d692 9f71feb545
commit 116b528e4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/canvas_glutin_minimal/src/main.rs
View File

@ -20,7 +20,7 @@ use pathfinder_color::ColorF;
use pathfinder_geometry::rect::RectF; use pathfinder_geometry::rect::RectF;
use pathfinder_geometry::vector::{vec2f, vec2i}; use pathfinder_geometry::vector::{vec2f, vec2i};
use pathfinder_gl::{GLDevice, GLVersion}; 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::rayon::RayonExecutor;
use pathfinder_renderer::concurrent::scene_proxy::SceneProxy; use pathfinder_renderer::concurrent::scene_proxy::SceneProxy;
use pathfinder_renderer::gpu::renderer::Renderer; use pathfinder_renderer::gpu::renderer::Renderer;
@ -49,7 +49,7 @@ fn main() {
// Create a Pathfinder renderer. // Create a Pathfinder renderer.
let mut renderer = Renderer::new(GLDevice::new(GLVersion::GL3, 0), let mut renderer = Renderer::new(GLDevice::new(GLVersion::GL3, 0),
&FilesystemResourceLoader::locate(), &EmbeddedResourceLoader,
DestFramebuffer::full_window(window_size), DestFramebuffer::full_window(window_size),
RendererOptions { RendererOptions {
background_color: Some(ColorF::white()), background_color: Some(ColorF::white()),

4
examples/canvas_metal_minimal/src/main.rs
View File

@ -20,7 +20,7 @@ use pathfinder_renderer::concurrent::scene_proxy::SceneProxy;
use pathfinder_renderer::gpu::options::{DestFramebuffer, RendererOptions}; use pathfinder_renderer::gpu::options::{DestFramebuffer, RendererOptions};
use pathfinder_renderer::gpu::renderer::Renderer; use pathfinder_renderer::gpu::renderer::Renderer;
use pathfinder_renderer::options::BuildOptions; use pathfinder_renderer::options::BuildOptions;
use pathfinder_resources::fs::FilesystemResourceLoader; use pathfinder_resources::embedded::EmbeddedResourceLoader;
use sdl2::event::Event; use sdl2::event::Event;
use sdl2::hint; use sdl2::hint;
use sdl2::keyboard::Keycode; use sdl2::keyboard::Keycode;
@ -47,7 +47,7 @@ fn main() {
// Create a Pathfinder renderer. // Create a Pathfinder renderer.
let mut renderer = Renderer::new(MetalDevice::new(metal_layer), let mut renderer = Renderer::new(MetalDevice::new(metal_layer),
&FilesystemResourceLoader::locate(), &EmbeddedResourceLoader,
DestFramebuffer::full_window(window_size), DestFramebuffer::full_window(window_size),
RendererOptions { background_color: Some(ColorF::white()) }); RendererOptions { background_color: Some(ColorF::white()) });

4
examples/canvas_moire/src/main.rs
View File

@ -18,7 +18,7 @@ use pathfinder_renderer::concurrent::scene_proxy::SceneProxy;
use pathfinder_renderer::gpu::options::{DestFramebuffer, RendererOptions}; use pathfinder_renderer::gpu::options::{DestFramebuffer, RendererOptions};
use pathfinder_renderer::gpu::renderer::Renderer; use pathfinder_renderer::gpu::renderer::Renderer;
use pathfinder_renderer::options::BuildOptions; use pathfinder_renderer::options::BuildOptions;
use pathfinder_resources::fs::FilesystemResourceLoader; use pathfinder_resources::embedded::EmbeddedResourceLoader;
use std::f32::consts::PI; use std::f32::consts::PI;
use std::f32; use std::f32;
use surfman::{Connection, ContextAttributeFlags, ContextAttributes, GLVersion as SurfmanGLVersion}; use surfman::{Connection, ContextAttributeFlags, ContextAttributes, GLVersion as SurfmanGLVersion};
@ -86,7 +86,7 @@ fn main() {
// Create our renderers. // Create our renderers.
let renderer = Renderer::new(pathfinder_device, let renderer = Renderer::new(pathfinder_device,
&FilesystemResourceLoader::locate(), &EmbeddedResourceLoader,
DestFramebuffer::full_window(framebuffer_size), DestFramebuffer::full_window(framebuffer_size),
RendererOptions { RendererOptions {
background_color: Some(ColorF::white()), background_color: Some(ColorF::white()),

4
examples/canvas_nanovg/src/main.rs
View File

@ -34,7 +34,7 @@ use pathfinder_renderer::gpu::options::{DestFramebuffer, RendererOptions};
use pathfinder_renderer::gpu::renderer::Renderer; use pathfinder_renderer::gpu::renderer::Renderer;
use pathfinder_renderer::options::BuildOptions; use pathfinder_renderer::options::BuildOptions;
use pathfinder_resources::ResourceLoader; use pathfinder_resources::ResourceLoader;
use pathfinder_resources::fs::FilesystemResourceLoader; use pathfinder_resources::embedded::EmbeddedResourceLoader;
use pathfinder_simd::default::F32x2; use pathfinder_simd::default::F32x2;
use std::collections::VecDeque; use std::collections::VecDeque;
use std::f32::consts::PI; 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); let framebuffer_size = vec2i(physical_size.width as i32, physical_size.height as i32);
// Load demo data. // Load demo data.
let resources = FilesystemResourceLoader::locate(); let resources = EmbeddedResourceLoader;
let font_data = vec![ 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-Regular.ttf").unwrap()), 0),
Handle::from_memory(Arc::new(resources.slurp("fonts/Roboto-Bold.ttf").unwrap()), 0), Handle::from_memory(Arc::new(resources.slurp("fonts/Roboto-Bold.ttf").unwrap()), 0),

4
examples/canvas_text/src/main.rs
View File

@ -19,7 +19,7 @@ use pathfinder_renderer::gpu::options::{DestFramebuffer, RendererOptions};
use pathfinder_renderer::gpu::renderer::Renderer; use pathfinder_renderer::gpu::renderer::Renderer;
use pathfinder_renderer::options::BuildOptions; use pathfinder_renderer::options::BuildOptions;
use pathfinder_resources::ResourceLoader; use pathfinder_resources::ResourceLoader;
use pathfinder_resources::fs::FilesystemResourceLoader; use pathfinder_resources::embedded::EmbeddedResourceLoader;
use sdl2::event::Event; use sdl2::event::Event;
use sdl2::keyboard::Keycode; use sdl2::keyboard::Keycode;
use sdl2::video::GLProfile; use sdl2::video::GLProfile;
@ -49,7 +49,7 @@ fn main() {
window.gl_make_current(&gl_context).unwrap(); window.gl_make_current(&gl_context).unwrap();
// Create a Pathfinder renderer. // Create a Pathfinder renderer.
let resource_loader = FilesystemResourceLoader::locate(); let resource_loader = EmbeddedResourceLoader;
let mut renderer = Renderer::new(GLDevice::new(GLVersion::GL3, 0), let mut renderer = Renderer::new(GLDevice::new(GLVersion::GL3, 0),
&resource_loader, &resource_loader,
DestFramebuffer::full_window(window_size), DestFramebuffer::full_window(window_size),

4
examples/swf_basic/src/main.rs
View File

@ -18,7 +18,7 @@ use pathfinder_renderer::gpu::renderer::Renderer;
use pathfinder_renderer::gpu::options::{DestFramebuffer, RendererOptions}; use pathfinder_renderer::gpu::options::{DestFramebuffer, RendererOptions};
use pathfinder_renderer::options::{RenderTransform, BuildOptions}; use pathfinder_renderer::options::{RenderTransform, BuildOptions};
use pathfinder_resources::ResourceLoader; use pathfinder_resources::ResourceLoader;
use pathfinder_resources::fs::FilesystemResourceLoader; use pathfinder_resources::embedded::EmbeddedResourceLoader;
use sdl2::event::Event; use sdl2::event::Event;
use sdl2::keyboard::Keycode; use sdl2::keyboard::Keycode;
use sdl2::video::GLProfile; use sdl2::video::GLProfile;
@ -28,7 +28,7 @@ use std::env;
use std::fs::read; use std::fs::read;
fn main() { fn main() {
let resource_loader = FilesystemResourceLoader::locate(); let resource_loader = EmbeddedResourceLoader;
let swf_bytes; let swf_bytes;
if let Some(path) = env::args().skip(1).next() { if let Some(path) = env::args().skip(1).next() {