render: Moved BoundingBox from core to render

This commit is contained in:
Nathan Adams 2022-08-14 01:03:00 +02:00 committed by Mike Welsh
parent 91a7047ebb
commit b3afb59b53
7 changed files with 6 additions and 6 deletions

View File

@ -5,7 +5,6 @@ use crate::avm2::{
Activation as Avm2Activation, Object as Avm2Object, StageObject as Avm2StageObject,
};
use crate::backend::video::{EncodedFrame, VideoStreamHandle};
use crate::bounding_box::BoundingBox;
use crate::context::{RenderContext, UpdateContext};
use crate::display_object::{DisplayObjectBase, DisplayObjectPtr, TDisplayObject};
use crate::prelude::*;
@ -13,6 +12,7 @@ use crate::tag_utils::{SwfMovie, SwfSlice};
use crate::vminterface::{AvmObject, AvmType, Instantiator};
use gc_arena::{Collect, GcCell, MutationContext};
use ruffle_render::bitmap::BitmapInfo;
use ruffle_render::bounding_box::BoundingBox;
use std::borrow::{Borrow, BorrowMut};
use std::cell::{Ref, RefMut};
use std::collections::{BTreeMap, BTreeSet};

View File

@ -1,9 +1,9 @@
use crate::backend::render::ShapeHandle;
use crate::bounding_box::BoundingBox;
use crate::context::RenderContext;
use crate::shape_utils::{DistilledShape, DrawCommand, DrawPath};
use gc_arena::Collect;
use ruffle_render::bitmap::{BitmapInfo, BitmapSource};
use ruffle_render::bounding_box::BoundingBox;
use std::cell::Cell;
use swf::{FillStyle, LineStyle, Twips};

View File

@ -16,7 +16,6 @@ mod avm1;
mod avm2;
mod binary_data;
pub mod bitmap;
mod bounding_box;
mod character;
pub mod color_transform;
pub mod context;

View File

@ -1,5 +1,4 @@
pub use crate::avm2::Value as Avm2Value;
pub use crate::bounding_box::BoundingBox;
pub use crate::color_transform::ColorTransform;
pub use crate::display_object::{
DisplayObject, DisplayObjectContainer, HitTestOptions, Lists, TDisplayObject,
@ -7,6 +6,7 @@ pub use crate::display_object::{
};
pub use crate::impl_display_object_container;
pub use log::{error, info, trace, warn};
pub use ruffle_render::bounding_box::BoundingBox;
pub use ruffle_render::matrix::Matrix;
pub use std::ops::{Bound, RangeBounds};
pub use swf::{CharacterId, Color, Twips};

View File

@ -1,4 +1,4 @@
use crate::bounding_box::BoundingBox;
use ruffle_render::bounding_box::BoundingBox;
use ruffle_render::matrix::Matrix;
use smallvec::SmallVec;
use swf::{CharacterId, FillStyle, LineStyle, Shape, ShapeRecord, Twips};

View File

@ -1,5 +1,5 @@
use crate::matrix::Matrix;
use gc_arena::Collect;
use ruffle_render::matrix::Matrix;
use swf::Twips;
#[derive(Clone, Collect, Debug, Default, Eq, PartialEq)]

View File

@ -1,4 +1,5 @@
pub mod bitmap;
pub mod bounding_box;
pub mod error;
pub mod matrix;
pub mod utils;