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

Update swf-related crates 

swf-tree got renamed into swf-types for their 0.10 release.
This commit is contained in:
Emmanuel Gil Peyrot 2020-02-04 21:15:06 +01:00
parent 2d2bc14e5c
commit fb22aafada
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/swf_basic/Cargo.toml
View File

@ -9,8 +9,8 @@ gl = "0.6"
sdl2 = "0.32" sdl2 = "0.32"
sdl2-sys = "0.32" sdl2-sys = "0.32"
swf-parser = "0.7.0" swf-parser = "0.10"
swf-tree = "0.7.0" swf-types = "0.10"
[dependencies.pathfinder_geometry] [dependencies.pathfinder_geometry]
path = "../../geometry" path = "../../geometry"

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

@ -63,7 +63,7 @@ fn main() {
swf_bytes = Vec::from(&default_tiger[..]); swf_bytes = Vec::from(&default_tiger[..]);
} }
let (_, movie): (_, swf_tree::Movie) = swf_parser::parsers::movie::parse_movie(&swf_bytes[..]).unwrap(); let (_, movie): (_, swf_types::Movie) = swf_parser::streaming::movie::parse_movie(&swf_bytes[..]).unwrap();
// Set up SDL2. // Set up SDL2.
let sdl_context = sdl2::init().unwrap(); let sdl_context = sdl2::init().unwrap();

4
swf/Cargo.toml
View File

@ -5,8 +5,8 @@ authors = ["Jon Hardie <jon@hardiesoft.com>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
swf-parser = "0.7.0" swf-parser = "0.10"
swf-tree = "0.7.0" swf-types = "0.10"
[dependencies.pathfinder_color] [dependencies.pathfinder_color]
path = "../color" path = "../color"

7
swf/src/lib.rs
View File

@ -15,9 +15,8 @@ use pathfinder_content::stroke::{OutlineStrokeToFill, StrokeStyle};
use pathfinder_geometry::vector::Vector2F; use pathfinder_geometry::vector::Vector2F;
use pathfinder_renderer::scene::{PathObject, Scene}; use pathfinder_renderer::scene::{PathObject, Scene};
use swf_tree; use swf_types::tags::SetBackgroundColor;
use swf_tree::tags::SetBackgroundColor; use swf_types::{Tag, SRgb8, Movie};
use swf_tree::{Tag, SRgb8, Movie};
use crate::shapes::{GraphicLayers, PaintOrLine}; use crate::shapes::{GraphicLayers, PaintOrLine};
@ -138,7 +137,7 @@ pub fn process_swf_tags(movie: &Movie) -> (SymbolLibrary, Stage) {
stage.background_color = *color; stage.background_color = *color;
}, },
Tag::DefineShape(shape) => { Tag::DefineShape(shape) => {
symbol_library.add_symbol(Symbol::Graphic(shapes::decode_shape(&shape))); symbol_library.add_symbol(Symbol::Graphic(shapes::decode_shape(shape)));
// We will assume that symbol ids just go up, and are 1 based. // We will assume that symbol ids just go up, and are 1 based.
let symbol_id: SymbolId = shape.id; let symbol_id: SymbolId = shape.id;
debug_assert!(symbol_id as usize == symbol_library.0.len()); debug_assert!(symbol_id as usize == symbol_library.0.len());

6
swf/src/shapes.rs
View File

@ -15,9 +15,9 @@ use pathfinder_content::stroke::{LineJoin, LineCap};
use pathfinder_renderer::paint::Paint; use pathfinder_renderer::paint::Paint;
use std::cmp::Ordering; use std::cmp::Ordering;
use std::mem; use std::mem;
use swf_tree::tags::DefineShape; use swf_types::tags::DefineShape;
use swf_tree::{CapStyle, FillStyle, JoinStyle, LineStyle, ShapeRecord, StraightSRgba8, Vector2D}; use swf_types::{CapStyle, FillStyle, JoinStyle, LineStyle, ShapeRecord, StraightSRgba8, Vector2D};
use swf_tree::{fill_styles, join_styles, shape_records}; use swf_types::{fill_styles, join_styles, shape_records};
#[derive(Clone, Copy, Debug)] #[derive(Clone, Copy, Debug)]
pub(crate) struct LineSegment { pub(crate) struct LineSegment {