render: Removed ruffle_core dep from all renderers

Cargo.lock

@@ -3117,9 +3117,9 @@ dependencies = [
  "fnv",
  "js-sys",
  "log",
- "ruffle_core",
  "ruffle_render",
  "ruffle_web_common",
+ "swf",
  "wasm-bindgen",
  "web-sys",
 ]
@@ -3130,8 +3130,8 @@ version = "0.1.0"
 dependencies = [
  "log",
  "lyon",
- "ruffle_core",
  "ruffle_render",
+ "swf",
 ]
 
 [[package]]
@@ -3142,10 +3142,10 @@ dependencies = [
  "fnv",
  "js-sys",
  "log",
- "ruffle_core",
  "ruffle_render",
  "ruffle_render_common_tess",
  "ruffle_web_common",
+ "swf",
  "wasm-bindgen",
  "web-sys",
 ]
@@ -3162,9 +3162,9 @@ dependencies = [
  "image",
  "log",
  "raw-window-handle 0.4.3",
- "ruffle_core",
  "ruffle_render",
  "ruffle_render_common_tess",
+ "swf",
  "web-sys",
  "wgpu",
 ]

render/canvas/Cargo.toml

@@ -12,10 +12,7 @@ ruffle_web_common = { path = "../../web/common" }
 wasm-bindgen = "=0.2.82"
 fnv = "1.0.7"
 ruffle_render = { path = ".." }
-
-[dependencies.ruffle_core]
-path = "../../core"
-default-features = false
+swf = { path = "../../swf" }
 
 [dependencies.web-sys]
 version = "0.3.58"

render/canvas/src/lib.rs

@@ -1,5 +1,4 @@
 use fnv::FnvHashMap;
-use ruffle_core::swf::{self, Color};
 use ruffle_render::backend::null::NullBitmapSource;
 use ruffle_render::backend::{RenderBackend, ShapeHandle};
 use ruffle_render::bitmap::{Bitmap, BitmapFormat, BitmapHandle, BitmapSource};
@@ -8,6 +7,7 @@ use ruffle_render::matrix::Matrix;
 use ruffle_render::shape_utils::{DistilledShape, DrawCommand, LineScaleMode, LineScales};
 use ruffle_render::transform::Transform;
 use ruffle_web_common::{JsError, JsResult};
+use swf::Color;
 use wasm_bindgen::{Clamped, JsCast};
 use web_sys::{
     CanvasGradient, CanvasPattern, CanvasRenderingContext2d, CanvasWindingRule, DomMatrix, Element,

render/common_tess/Cargo.toml

@@ -9,7 +9,4 @@ license = "MIT OR Apache-2.0"
 log = "0.4"
 lyon = "1.0.0"
 ruffle_render = { path = ".." }
-
-[dependencies.ruffle_core]
-path = "../../core"
-default-features = false
+swf = { path = "../../swf" }

render/common_tess/src/lib.rs

@@ -5,7 +5,6 @@ use lyon::tessellation::{
     FillTessellator, FillVertex, StrokeTessellator, StrokeVertex, StrokeVertexConstructor,
 };
 use lyon::tessellation::{FillOptions, StrokeOptions};
-use ruffle_core::swf;
 use ruffle_render::bitmap::{BitmapHandle, BitmapSource};
 use ruffle_render::shape_utils::{DistilledShape, DrawCommand, DrawPath};
 

render/webgl/Cargo.toml

@@ -14,10 +14,7 @@ ruffle_render = { path = ".." }
 wasm-bindgen = "=0.2.82"
 bytemuck = { version = "1.10.0", features = ["derive"] }
 fnv = "1.0.7"
-
-[dependencies.ruffle_core]
-path = "../../core"
-default-features = false
+swf = { path = "../../swf" }
 
 [dependencies.web-sys]
 version = "0.3.58"

render/webgl/src/lib.rs

@@ -1,6 +1,5 @@
 use bytemuck::{Pod, Zeroable};
 use fnv::FnvHashMap;
-use ruffle_core::swf::{self, Color};
 use ruffle_render::backend::null::NullBitmapSource;
 use ruffle_render::backend::{RenderBackend, ShapeHandle};
 use ruffle_render::bitmap::{Bitmap, BitmapFormat, BitmapHandle, BitmapSource};
@@ -10,6 +9,7 @@ use ruffle_render_common_tess::{
     Gradient as TessGradient, GradientType, ShapeTessellator, Vertex as TessVertex,
 };
 use ruffle_web_common::JsResult;
+use swf::Color;
 use wasm_bindgen::{JsCast, JsValue};
 use web_sys::{
     HtmlCanvasElement, OesVertexArrayObject, WebGl2RenderingContext as Gl2, WebGlBuffer,

render/wgpu/Cargo.toml

@@ -8,7 +8,6 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 wgpu = "0.13.0"
 log = "0.4"
-ruffle_core = { path = "../../core", default-features = false }
 ruffle_render_common_tess = { path = "../common_tess" }
 ruffle_render = { path = ".." }
 bytemuck = { version = "1.10.0", features = ["derive"] }
@@ -16,6 +15,7 @@ raw-window-handle = "0.4"
 clap = { version = "3.2.16", features = ["derive"], optional = true }
 enum-map = "2.4.1"
 fnv = "1.0.7"
+swf = { path = "../../swf" }
 
 # desktop
 [target.'cfg(not(target_family = "wasm"))'.dependencies.futures]

render/wgpu/src/lib.rs

@@ -7,7 +7,6 @@ use crate::utils::{create_buffer_with_data, format_list, get_backend_names};
 use bytemuck::{Pod, Zeroable};
 use enum_map::Enum;
 use fnv::FnvHashMap;
-use ruffle_core::swf::{self, Color};
 use ruffle_render::backend::{RenderBackend, ShapeHandle};
 use ruffle_render::bitmap::{Bitmap, BitmapHandle, BitmapSource};
 use ruffle_render::color_transform::ColorTransform;
@@ -20,6 +19,7 @@ use ruffle_render_common_tess::{
 use std::num::NonZeroU32;
 use std::path::Path;
 use std::sync::Arc;
+use swf::Color;
 pub use wgpu;
 
 type Error = Box<dyn std::error::Error>;