diff --git a/editor/src/asset/mod.rs b/editor/src/asset/mod.rs index 5244a03e5..e462c0813 100644 --- a/editor/src/asset/mod.rs +++ b/editor/src/asset/mod.rs @@ -37,7 +37,7 @@ use crate::{ ok_or_continue, pool::Handle, some_or_continue, SafeLock, }, engine::Engine, - graph::{BaseSceneGraph, SceneGraph}, + graph::SceneGraph, gui::{ border::BorderBuilder, button::{Button, ButtonBuilder, ButtonMessage}, diff --git a/editor/src/asset/preview/mod.rs b/editor/src/asset/preview/mod.rs index e239c275c..e9db96cd3 100644 --- a/editor/src/asset/preview/mod.rs +++ b/editor/src/asset/preview/mod.rs @@ -33,7 +33,7 @@ use crate::{ }, engine::{Engine, GraphicsContext}, fxhash::FxHashMap, - graph::{BaseSceneGraph, SceneGraphNode}, + graph::{SceneGraph, SceneGraphNode}, graphics::{framebuffer::ReadTarget, gpu_texture::GpuTextureKind}, gui::{ font::Font, formatted_text::WrapMode, screen::ScreenBuilder, text::TextBuilder, diff --git a/editor/src/audio/mod.rs b/editor/src/audio/mod.rs index 3dada8406..c0c19c19f 100644 --- a/editor/src/audio/mod.rs +++ b/editor/src/audio/mod.rs @@ -26,7 +26,7 @@ use crate::{ fyrox::{ core::{pool::Handle, reflect::Reflect, some_or_return}, engine::Engine, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ button::{ButtonBuilder, ButtonMessage}, dropdown_list::{DropdownListBuilder, DropdownListMessage}, diff --git a/editor/src/camera/mod.rs b/editor/src/camera/mod.rs index 824808a00..97b081efc 100644 --- a/editor/src/camera/mod.rs +++ b/editor/src/camera/mod.rs @@ -29,7 +29,7 @@ use crate::{ }, pool::Handle, }, - graph::{BaseSceneGraph, SceneGraph, SceneGraphNode}, + graph::{SceneGraph, SceneGraphNode}, gui::message::{KeyCode, KeyboardModifiers, MouseButton}, renderer::bundle::{RenderContext, RenderDataBundleStorage}, scene::{ diff --git a/editor/src/camera/panel.rs b/editor/src/camera/panel.rs index da7914b91..e97a90989 100644 --- a/editor/src/camera/panel.rs +++ b/editor/src/camera/panel.rs @@ -40,7 +40,6 @@ use crate::{ Message, }; use fyrox::core::algebra::Vector2; -use fyrox::graph::BaseSceneGraph; use fyrox::gui::widget::WidgetMessage; use fyrox::gui::window::WindowAlignment; use fyrox::scene::collider::BitMask; diff --git a/editor/src/export/mod.rs b/editor/src/export/mod.rs index 1b31517fa..99c6db8a7 100644 --- a/editor/src/export/mod.rs +++ b/editor/src/export/mod.rs @@ -34,7 +34,7 @@ use crate::{ pool::Handle, reflect::prelude::*, }, - graph::{BaseSceneGraph, SceneGraph}, + graph::SceneGraph, gui::{ border::BorderBuilder, button::{ButtonBuilder, ButtonMessage}, diff --git a/editor/src/highlight.rs b/editor/src/highlight.rs index eb9670d5f..f4c36d7b2 100644 --- a/editor/src/highlight.rs +++ b/editor/src/highlight.rs @@ -22,7 +22,7 @@ use crate::{ fyrox::{ core::{color::Color, pool::Handle, sstorage::ImmutableString}, fxhash::FxHashSet, - graph::{BaseSceneGraph, SceneGraph}, + graph::SceneGraph, graphics::{ error::FrameworkError, framebuffer::{Attachment, GpuFrameBuffer}, diff --git a/editor/src/interaction/gizmo/move_gizmo.rs b/editor/src/interaction/gizmo/move_gizmo.rs index cd38daf2b..b2a67599c 100644 --- a/editor/src/interaction/gizmo/move_gizmo.rs +++ b/editor/src/interaction/gizmo/move_gizmo.rs @@ -26,7 +26,7 @@ use crate::{ math::Matrix4Ext, pool::Handle, }, - graph::BaseSceneGraph, + graph::SceneGraph, scene::{ base::BaseBuilder, graph::Graph, diff --git a/editor/src/interaction/gizmo/rotate_gizmo.rs b/editor/src/interaction/gizmo/rotate_gizmo.rs index 450ca7fca..e91e68228 100644 --- a/editor/src/interaction/gizmo/rotate_gizmo.rs +++ b/editor/src/interaction/gizmo/rotate_gizmo.rs @@ -26,7 +26,7 @@ use crate::{ math::{plane::Plane, Matrix4Ext}, pool::Handle, }, - graph::BaseSceneGraph, + graph::SceneGraph, scene::{ base::BaseBuilder, graph::Graph, diff --git a/editor/src/interaction/gizmo/scale_gizmo.rs b/editor/src/interaction/gizmo/scale_gizmo.rs index 8fd5a032e..3bb2be3b2 100644 --- a/editor/src/interaction/gizmo/scale_gizmo.rs +++ b/editor/src/interaction/gizmo/scale_gizmo.rs @@ -26,7 +26,7 @@ use crate::{ math::{plane::Plane, Matrix4Ext}, pool::Handle, }, - graph::BaseSceneGraph, + graph::SceneGraph, scene::{ base::BaseBuilder, graph::Graph, diff --git a/editor/src/interaction/navmesh/selection.rs b/editor/src/interaction/navmesh/selection.rs index 1e1d9dbee..a05cd7b55 100644 --- a/editor/src/interaction/navmesh/selection.rs +++ b/editor/src/interaction/navmesh/selection.rs @@ -30,7 +30,7 @@ use crate::scene::{EntityInfo, GameScene, SelectionContainer}; use fyrox::core::reflect::Reflect; use fyrox::core::some_or_return; use fyrox::engine::Engine; -use fyrox::graph::BaseSceneGraph; +use fyrox::graph::SceneGraph; use fyrox::gui::inspector::PropertyChanged; use fyrox::scene::SceneContainer; use std::{ diff --git a/editor/src/interaction/select_mode.rs b/editor/src/interaction/select_mode.rs index ad555750b..4fd792ca6 100644 --- a/editor/src/interaction/select_mode.rs +++ b/editor/src/interaction/select_mode.rs @@ -26,7 +26,7 @@ use crate::{ uuid::{uuid, Uuid}, TypeUuidProvider, }, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{BuildContext, UiNode}, scene::node::Node, }, diff --git a/editor/src/interaction/terrain.rs b/editor/src/interaction/terrain.rs index 461c97cec..485022a2b 100644 --- a/editor/src/interaction/terrain.rs +++ b/editor/src/interaction/terrain.rs @@ -33,7 +33,7 @@ use crate::{ TypeUuidProvider, }, engine::Engine, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ inspector::{ editors::{ diff --git a/editor/src/lib.rs b/editor/src/lib.rs index f46162ba2..96943d8ed 100644 --- a/editor/src/lib.rs +++ b/editor/src/lib.rs @@ -92,7 +92,7 @@ use crate::{ event::{Event, WindowEvent}, event_loop::EventLoop, fxhash::{FxHashMap, FxHashSet}, - graph::{BaseSceneGraph, SceneGraph}, + graph::SceneGraph, gui::{ brush::Brush, button::ButtonBuilder, diff --git a/editor/src/menu/view.rs b/editor/src/menu/view.rs index 0937998cd..49b40a5f6 100644 --- a/editor/src/menu/view.rs +++ b/editor/src/menu/view.rs @@ -21,7 +21,7 @@ use crate::{ fyrox::{ core::pool::Handle, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ menu::{self, MenuItemMessage}, message::UiMessage, diff --git a/editor/src/plugins/absm/blendspace.rs b/editor/src/plugins/absm/blendspace.rs index 4a540353c..809ebc517 100644 --- a/editor/src/plugins/absm/blendspace.rs +++ b/editor/src/plugins/absm/blendspace.rs @@ -33,7 +33,7 @@ use crate::fyrox::{ node::blendspace::BlendSpacePoint, node::PoseNode, parameter::Parameter, parameter::ParameterContainer, Machine, MachineLayer, }, - graph::{BaseSceneGraph, PrefabData, SceneGraph, SceneGraphNode}, + graph::{PrefabData, SceneGraph, SceneGraphNode}, gui::{ brush::Brush, define_widget_deref, diff --git a/editor/src/plugins/absm/canvas.rs b/editor/src/plugins/absm/canvas.rs index da001bf3a..04633db36 100644 --- a/editor/src/plugins/absm/canvas.rs +++ b/editor/src/plugins/absm/canvas.rs @@ -29,7 +29,7 @@ use crate::fyrox::{ uuid_provider, visitor::prelude::*, }, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ brush::Brush, define_widget_deref, diff --git a/editor/src/plugins/absm/command/mod.rs b/editor/src/plugins/absm/command/mod.rs index 298a34e7a..cb92693fb 100644 --- a/editor/src/plugins/absm/command/mod.rs +++ b/editor/src/plugins/absm/command/mod.rs @@ -20,7 +20,7 @@ use crate::fyrox::core::pool::ErasedHandle; use crate::fyrox::core::variable::InheritableVariable; -use crate::fyrox::graph::{BaseSceneGraph, SceneGraphNode}; +use crate::fyrox::graph::{SceneGraph, SceneGraphNode}; use crate::fyrox::{ core::{ algebra::Vector2, diff --git a/editor/src/plugins/absm/mod.rs b/editor/src/plugins/absm/mod.rs index 8a481eea8..d1365973b 100644 --- a/editor/src/plugins/absm/mod.rs +++ b/editor/src/plugins/absm/mod.rs @@ -32,7 +32,7 @@ use crate::{ }, AnimationContainer, }, - graph::{BaseSceneGraph, PrefabData, SceneGraph, SceneGraphNode}, + graph::{PrefabData, SceneGraph, SceneGraphNode}, gui::{ check_box::CheckBoxMessage, dock::{DockingManagerBuilder, DockingManagerMessage, TileBuilder, TileContent}, diff --git a/editor/src/plugins/absm/node.rs b/editor/src/plugins/absm/node.rs index 41ebbc87c..4427b035b 100644 --- a/editor/src/plugins/absm/node.rs +++ b/editor/src/plugins/absm/node.rs @@ -23,7 +23,7 @@ use crate::fyrox::{ color::Color, pool::Handle, reflect::prelude::*, type_traits::prelude::*, uuid::uuid, visitor::prelude::*, }, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ border::{BorderBuilder, BorderMessage}, brush::Brush, diff --git a/editor/src/plugins/absm/parameter.rs b/editor/src/plugins/absm/parameter.rs index 48f6d545d..d6a2a90aa 100644 --- a/editor/src/plugins/absm/parameter.rs +++ b/editor/src/plugins/absm/parameter.rs @@ -25,7 +25,7 @@ use crate::{ generic_animation::machine::parameter::{ Parameter, ParameterContainer, ParameterDefinition, }, - graph::{BaseSceneGraph, PrefabData, SceneGraph, SceneGraphNode}, + graph::{PrefabData, SceneGraph, SceneGraphNode}, gui::{ inspector::{ editors::{ diff --git a/editor/src/plugins/absm/selection.rs b/editor/src/plugins/absm/selection.rs index ccd2e064b..b33374b87 100644 --- a/editor/src/plugins/absm/selection.rs +++ b/editor/src/plugins/absm/selection.rs @@ -30,7 +30,7 @@ use crate::{ engine::Engine, generic_animation::machine::Machine, generic_animation::machine::{PoseNode, State, Transition}, - graph::{BaseSceneGraph, SceneGraphNode}, + graph::{SceneGraph, SceneGraphNode}, gui::inspector::PropertyChanged, scene::SceneContainer, }, diff --git a/editor/src/plugins/absm/state_graph/context.rs b/editor/src/plugins/absm/state_graph/context.rs index 2bf47e63f..3d0bb91aa 100644 --- a/editor/src/plugins/absm/state_graph/context.rs +++ b/editor/src/plugins/absm/state_graph/context.rs @@ -24,7 +24,7 @@ use crate::{ fyrox::{ core::pool::Handle, generic_animation::machine::{Machine, State, Transition}, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ menu::MenuItemMessage, message::UiMessage, diff --git a/editor/src/plugins/absm/state_graph/mod.rs b/editor/src/plugins/absm/state_graph/mod.rs index cef0f5d28..2295ac65a 100644 --- a/editor/src/plugins/absm/state_graph/mod.rs +++ b/editor/src/plugins/absm/state_graph/mod.rs @@ -18,11 +18,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -use crate::fyrox::graph::{PrefabData, SceneGraph, SceneGraphNode}; +use crate::fyrox::graph::{PrefabData, SceneGraphNode}; use crate::fyrox::{ core::pool::{ErasedHandle, Handle}, generic_animation::machine::{Machine, MachineLayer, State, Transition}, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ border::BorderBuilder, message::{MessageDirection, UiMessage}, diff --git a/editor/src/plugins/absm/state_viewer/context.rs b/editor/src/plugins/absm/state_viewer/context.rs index 42144e755..869a6dbfa 100644 --- a/editor/src/plugins/absm/state_viewer/context.rs +++ b/editor/src/plugins/absm/state_viewer/context.rs @@ -25,7 +25,7 @@ use crate::fyrox::{ node::{blendspace::BlendSpace, blendspace::BlendSpacePoint, BasePoseNode}, BlendAnimations, BlendAnimationsByIndex, MachineLayer, PlayAnimation, PoseNode, State, }, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ menu::MenuItemMessage, message::UiMessage, diff --git a/editor/src/plugins/absm/state_viewer/mod.rs b/editor/src/plugins/absm/state_viewer/mod.rs index b7c5c686c..0fb8a969a 100644 --- a/editor/src/plugins/absm/state_viewer/mod.rs +++ b/editor/src/plugins/absm/state_viewer/mod.rs @@ -28,7 +28,7 @@ use crate::fyrox::{ machine::{MachineLayer, PoseNode, State}, Animation, }, - graph::{BaseSceneGraph, SceneGraph}, + graph::SceneGraph, gui::{ border::BorderBuilder, message::{MessageDirection, UiMessage}, diff --git a/editor/src/plugins/absm/toolbar.rs b/editor/src/plugins/absm/toolbar.rs index 85008b75e..e037c15f2 100644 --- a/editor/src/plugins/absm/toolbar.rs +++ b/editor/src/plugins/absm/toolbar.rs @@ -24,7 +24,7 @@ use crate::{ core::pool::Handle, fxhash::FxHashSet, generic_animation::machine::{mask::LayerMask, Machine, MachineLayer}, - graph::{BaseSceneGraph, PrefabData, SceneGraph, SceneGraphNode}, + graph::{PrefabData, SceneGraph, SceneGraphNode}, gui::{ button::{ButtonBuilder, ButtonMessage}, check_box::{CheckBoxBuilder, CheckBoxMessage}, diff --git a/editor/src/plugins/animation/command/mod.rs b/editor/src/plugins/animation/command/mod.rs index 7caa14486..d28ae5f33 100644 --- a/editor/src/plugins/animation/command/mod.rs +++ b/editor/src/plugins/animation/command/mod.rs @@ -30,7 +30,7 @@ use crate::fyrox::{ signal::AnimationSignal, track::Track, value::ValueBinding, Animation, AnimationContainer, RootMotionSettings, }, - graph::{BaseSceneGraph, SceneGraphNode}, + graph::{SceneGraph, SceneGraphNode}, }; use crate::plugins::animation::selection::AnimationSelection; use crate::{ diff --git a/editor/src/plugins/animation/mod.rs b/editor/src/plugins/animation/mod.rs index bfa0cb708..67b5fcfe6 100644 --- a/editor/src/plugins/animation/mod.rs +++ b/editor/src/plugins/animation/mod.rs @@ -30,7 +30,7 @@ use crate::{ engine::ApplicationLoopController, fxhash::FxHashSet, generic_animation::{signal::AnimationSignal, AnimationContainer}, - graph::{BaseSceneGraph, PrefabData, SceneGraph, SceneGraphNode}, + graph::{PrefabData, SceneGraph, SceneGraphNode}, gui::{ border::BorderBuilder, brush::Brush, diff --git a/editor/src/plugins/animation/ruler.rs b/editor/src/plugins/animation/ruler.rs index adb36eecd..b22563894 100644 --- a/editor/src/plugins/animation/ruler.rs +++ b/editor/src/plugins/animation/ruler.rs @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -use crate::fyrox::graph::BaseSceneGraph; +use crate::fyrox::graph::SceneGraph; use crate::fyrox::{ core::{ algebra::{Point2, Vector2}, diff --git a/editor/src/plugins/animation/selection.rs b/editor/src/plugins/animation/selection.rs index deafc1b3a..5c4c6ddb1 100644 --- a/editor/src/plugins/animation/selection.rs +++ b/editor/src/plugins/animation/selection.rs @@ -30,7 +30,7 @@ use crate::{ }, engine::Engine, generic_animation::{Animation, AnimationContainer}, - graph::{BaseSceneGraph, SceneGraphNode}, + graph::{SceneGraph, SceneGraphNode}, gui::inspector::PropertyChanged, scene::SceneContainer, }, diff --git a/editor/src/plugins/animation/toolbar.rs b/editor/src/plugins/animation/toolbar.rs index 19cd695fd..150da5905 100644 --- a/editor/src/plugins/animation/toolbar.rs +++ b/editor/src/plugins/animation/toolbar.rs @@ -27,7 +27,7 @@ use crate::{ pool::ErasedHandle, pool::Handle, }, generic_animation::{Animation, AnimationContainer, RootMotionSettings}, - graph::{BaseSceneGraph, PrefabData, SceneGraph, SceneGraphNode}, + graph::{PrefabData, SceneGraph, SceneGraphNode}, gui::{ border::BorderBuilder, button::{Button, ButtonBuilder, ButtonMessage}, diff --git a/editor/src/plugins/animation/track.rs b/editor/src/plugins/animation/track.rs index d56aaa5a2..1e4c6ca31 100644 --- a/editor/src/plugins/animation/track.rs +++ b/editor/src/plugins/animation/track.rs @@ -44,7 +44,7 @@ use crate::{ value::{ValueBinding, ValueType}, Animation, }, - graph::{BaseSceneGraph, SceneGraph, SceneGraphNode}, + graph::{SceneGraph, SceneGraphNode}, graphics::DrawParameters, gui::{ border::BorderBuilder, diff --git a/editor/src/plugins/collider/mod.rs b/editor/src/plugins/collider/mod.rs index 1b40798e6..9a201adb4 100644 --- a/editor/src/plugins/collider/mod.rs +++ b/editor/src/plugins/collider/mod.rs @@ -52,7 +52,7 @@ use crate::{ Uuid, }, engine::Engine, - graph::{BaseSceneGraph, SceneGraph, SceneGraphNode}, + graph::{SceneGraph, SceneGraphNode}, gui::{message::UiMessage, BuildContext, UiNode}, material::{ shader::{ShaderResource, ShaderResourceExtension}, diff --git a/editor/src/plugins/collider/panel.rs b/editor/src/plugins/collider/panel.rs index bc45f93b9..7baf807ba 100644 --- a/editor/src/plugins/collider/panel.rs +++ b/editor/src/plugins/collider/panel.rs @@ -23,7 +23,7 @@ use crate::{ fyrox::{ core::{algebra::Vector3, pool::Handle, reflect::Reflect, TypeUuidProvider}, engine::Engine, - graph::{BaseSceneGraph, SceneGraph}, + graph::SceneGraph, gui::{ button::{ButtonBuilder, ButtonMessage}, message::UiMessage, diff --git a/editor/src/plugins/inspector/editors/dyntype.rs b/editor/src/plugins/inspector/editors/dyntype.rs index b8907a9d7..6ad751d1c 100644 --- a/editor/src/plugins/inspector/editors/dyntype.rs +++ b/editor/src/plugins/inspector/editors/dyntype.rs @@ -21,7 +21,7 @@ use crate::{ fyrox::{ core::dyntype::{DynTypeConstructorContainer, DynTypeContainer}, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ core::{ parking_lot::Mutex, pool::Handle, reflect::prelude::*, type_traits::prelude::*, diff --git a/editor/src/plugins/inspector/editors/font.rs b/editor/src/plugins/inspector/editors/font.rs index 838c5a8e7..17a0f7dd1 100644 --- a/editor/src/plugins/inspector/editors/font.rs +++ b/editor/src/plugins/inspector/editors/font.rs @@ -25,7 +25,7 @@ use crate::{ algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*, type_traits::prelude::*, uuid_provider, visitor::prelude::*, }, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ brush::Brush, draw::{CommandTexture, Draw, DrawingContext}, diff --git a/editor/src/plugins/inspector/editors/handle.rs b/editor/src/plugins/inspector/editors/handle.rs index bdaec4be3..61fb58907 100644 --- a/editor/src/plugins/inspector/editors/handle.rs +++ b/editor/src/plugins/inspector/editors/handle.rs @@ -25,7 +25,7 @@ use crate::{ color::Color, pool::ErasedHandle, pool::Handle, reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*, SafeLock, }, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ brush::Brush, button::{ButtonBuilder, ButtonMessage}, diff --git a/editor/src/plugins/inspector/editors/resource.rs b/editor/src/plugins/inspector/editors/resource.rs index 629592f87..5df01926b 100644 --- a/editor/src/plugins/inspector/editors/resource.rs +++ b/editor/src/plugins/inspector/editors/resource.rs @@ -29,7 +29,7 @@ use crate::{ color::Color, log::Log, parking_lot::Mutex, pool::Handle, reflect::prelude::*, type_traits::prelude::*, uuid::uuid, visitor::prelude::*, PhantomDataSendSync, }, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ brush::Brush, button::{ButtonBuilder, ButtonMessage}, diff --git a/editor/src/plugins/inspector/editors/script.rs b/editor/src/plugins/inspector/editors/script.rs index 687c23d03..7ab4e2923 100644 --- a/editor/src/plugins/inspector/editors/script.rs +++ b/editor/src/plugins/inspector/editors/script.rs @@ -24,7 +24,7 @@ use crate::fyrox::{ uuid_provider, visitor::prelude::*, }, engine::SerializationContext, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ button::{ButtonBuilder, ButtonMessage}, dropdown_list::{DropdownList, DropdownListMessage}, diff --git a/editor/src/plugins/inspector/editors/spritesheet/window.rs b/editor/src/plugins/inspector/editors/spritesheet/window.rs index ee459443c..00c93c2b1 100644 --- a/editor/src/plugins/inspector/editors/spritesheet/window.rs +++ b/editor/src/plugins/inspector/editors/spritesheet/window.rs @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -use crate::fyrox::graph::BaseSceneGraph; +use crate::fyrox::graph::SceneGraph; use crate::fyrox::{ core::{ algebra::Vector2, parking_lot::Mutex, pool::Handle, reflect::prelude::*, diff --git a/editor/src/plugins/inspector/editors/surface.rs b/editor/src/plugins/inspector/editors/surface.rs index 17ca289c7..5628963c2 100644 --- a/editor/src/plugins/inspector/editors/surface.rs +++ b/editor/src/plugins/inspector/editors/surface.rs @@ -30,7 +30,7 @@ use crate::{ futures::executor::block_on, log::Log, make_relative_path, pool::Handle, reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*, }, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ button::{ButtonBuilder, ButtonMessage}, define_widget_deref, diff --git a/editor/src/plugins/inspector/editors/texture.rs b/editor/src/plugins/inspector/editors/texture.rs index 4864b9799..346bb7cc0 100644 --- a/editor/src/plugins/inspector/editors/texture.rs +++ b/editor/src/plugins/inspector/editors/texture.rs @@ -26,7 +26,7 @@ use crate::{ algebra::Vector2, make_relative_path, pool::Handle, reflect::prelude::*, type_traits::prelude::*, uuid_provider, visitor::prelude::*, }, - graph::{BaseSceneGraph, SceneGraph}, + graph::SceneGraph, gui::{ grid::{Column, GridBuilder, Row}, image::{ImageBuilder, ImageMessage}, diff --git a/editor/src/plugins/inspector/handlers/node/mod.rs b/editor/src/plugins/inspector/handlers/node/mod.rs index 23b754001..feb3e8791 100644 --- a/editor/src/plugins/inspector/handlers/node/mod.rs +++ b/editor/src/plugins/inspector/handlers/node/mod.rs @@ -30,7 +30,7 @@ use crate::{ scene::commands::terrain::{AddTerrainLayerCommand, DeleteTerrainLayerCommand}, Command, }; -use fyrox::graph::BaseSceneGraph; +use fyrox::graph::SceneGraph; pub struct SceneNodePropertyChangedHandler; diff --git a/editor/src/plugins/inspector/mod.rs b/editor/src/plugins/inspector/mod.rs index 95836f6b9..2be1b6870 100644 --- a/editor/src/plugins/inspector/mod.rs +++ b/editor/src/plugins/inspector/mod.rs @@ -30,7 +30,7 @@ use crate::{ type_traits::prelude::*, }, engine::SerializationContext, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ border::BorderBuilder, button::ButtonMessage, diff --git a/editor/src/plugins/material/editor.rs b/editor/src/plugins/material/editor.rs index 304f27d46..d96fb7ac8 100644 --- a/editor/src/plugins/material/editor.rs +++ b/editor/src/plugins/material/editor.rs @@ -30,7 +30,7 @@ use crate::{ color::Color, log::Log, parking_lot::Mutex, reflect::prelude::*, type_traits::prelude::*, uuid_provider, visitor::prelude::*, SafeLock, }, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ brush::Brush, button::{ButtonBuilder, ButtonMessage}, diff --git a/editor/src/plugins/probe.rs b/editor/src/plugins/probe.rs index 17097fe85..f8698283f 100644 --- a/editor/src/plugins/probe.rs +++ b/editor/src/plugins/probe.rs @@ -30,7 +30,7 @@ use crate::{ Uuid, }, engine::Engine, - graph::{BaseSceneGraph, SceneGraph}, + graph::SceneGraph, gui::{ button::{ButtonBuilder, ButtonMessage}, grid::{Column, GridBuilder, Row}, diff --git a/editor/src/plugins/ragdoll.rs b/editor/src/plugins/ragdoll.rs index 9627672cb..1e4363ad1 100644 --- a/editor/src/plugins/ragdoll.rs +++ b/editor/src/plugins/ragdoll.rs @@ -29,7 +29,7 @@ use crate::{ reflect::prelude::*, some_or_return, }, - graph::{BaseSceneGraph, SceneGraph}, + graph::SceneGraph, gui::{ button::{ButtonBuilder, ButtonMessage}, grid::{Column, GridBuilder, Row}, diff --git a/editor/src/plugins/settings.rs b/editor/src/plugins/settings.rs index f3145e1f7..74f260d24 100644 --- a/editor/src/plugins/settings.rs +++ b/editor/src/plugins/settings.rs @@ -27,7 +27,7 @@ use crate::{ log::Log, parking_lot::lock_api::Mutex, pool::Handle, reflect::Reflect, some_or_return, }, engine::Engine, - graph::{BaseSceneGraph, SceneGraph}, + graph::SceneGraph, gui::{ button::{ButtonBuilder, ButtonMessage}, dock::DockingManagerMessage, diff --git a/editor/src/plugins/tilemap/mod.rs b/editor/src/plugins/tilemap/mod.rs index 8789c5dbf..212c809fc 100644 --- a/editor/src/plugins/tilemap/mod.rs +++ b/editor/src/plugins/tilemap/mod.rs @@ -88,7 +88,7 @@ use crate::fyrox::{ }, engine::Engine, fxhash::FxHashSet, - graph::{BaseSceneGraph, SceneGraph, SceneGraphNode}, + graph::{SceneGraph, SceneGraphNode}, gui::{ border::BorderBuilder, brush::Brush, diff --git a/editor/src/plugins/tilemap/palette.rs b/editor/src/plugins/tilemap/palette.rs index ae83084b4..6ba23a740 100644 --- a/editor/src/plugins/tilemap/palette.rs +++ b/editor/src/plugins/tilemap/palette.rs @@ -38,7 +38,7 @@ use crate::{ SafeLock, }, fxhash::{FxHashMap, FxHashSet}, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ brush::Brush, define_widget_deref, diff --git a/editor/src/plugins/tilemap/panel.rs b/editor/src/plugins/tilemap/panel.rs index c2a407c5c..0be01195d 100644 --- a/editor/src/plugins/tilemap/panel.rs +++ b/editor/src/plugins/tilemap/panel.rs @@ -30,7 +30,7 @@ use crate::{ asset::item::AssetItem, fyrox::{ core::pool::Handle, - graph::{BaseSceneGraph, SceneGraph}, + graph::SceneGraph, gui::{ border::BorderBuilder, brush::Brush, diff --git a/editor/src/preview.rs b/editor/src/preview.rs index 73804bc47..e603b42bd 100644 --- a/editor/src/preview.rs +++ b/editor/src/preview.rs @@ -25,7 +25,7 @@ use crate::{ color::Color, pool::Handle, }, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ button::{ButtonBuilder, ButtonMessage}, grid::{Column, GridBuilder, Row}, diff --git a/editor/src/scene/commands/graph.rs b/editor/src/scene/commands/graph.rs index 9b8c33d81..0658d1e9a 100644 --- a/editor/src/scene/commands/graph.rs +++ b/editor/src/scene/commands/graph.rs @@ -25,7 +25,7 @@ use crate::{ algebra::{UnitQuaternion, Vector3}, pool::{Handle, Ticket}, }, - graph::{BaseSceneGraph, LinkScheme, SceneGraphNode}, + graph::{LinkScheme, SceneGraph, SceneGraphNode}, scene::{ base::Base, graph::{Graph, SubGraph}, diff --git a/editor/src/scene/commands/mod.rs b/editor/src/scene/commands/mod.rs index 23ac46038..042627006 100644 --- a/editor/src/scene/commands/mod.rs +++ b/editor/src/scene/commands/mod.rs @@ -22,7 +22,7 @@ use crate::fyrox::{ asset::manager::ResourceManager, core::{log::Log, pool::Handle, reflect::prelude::*, type_traits::prelude::*}, engine::SerializationContext, - graph::{BaseSceneGraph, SceneGraphNode}, + graph::{SceneGraph, SceneGraphNode}, scene::{graph::SubGraph, node::Node, Scene}, }; use crate::{ diff --git a/editor/src/scene/mod.rs b/editor/src/scene/mod.rs index 0342ab149..cdc8b0a2c 100644 --- a/editor/src/scene/mod.rs +++ b/editor/src/scene/mod.rs @@ -39,7 +39,7 @@ use crate::{ }, engine::{Engine, SerializationContext}, fxhash::FxHashSet, - graph::{BaseSceneGraph, SceneGraph, SceneGraphNode}, + graph::{SceneGraph, SceneGraphNode}, gui::{ inspector::PropertyChanged, message::UiMessage, diff --git a/editor/src/scene/property.rs b/editor/src/scene/property.rs index ed464fc87..4737c6d1f 100644 --- a/editor/src/scene/property.rs +++ b/editor/src/scene/property.rs @@ -24,7 +24,7 @@ use crate::fyrox::{ sstorage::ImmutableString, type_traits::prelude::*, uuid_provider, visitor::prelude::*, }, fxhash::FxHashSet, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ border::BorderBuilder, button::{ButtonBuilder, ButtonMessage}, diff --git a/editor/src/scene/selector.rs b/editor/src/scene/selector.rs index 21010b38a..a958cf5f8 100644 --- a/editor/src/scene/selector.rs +++ b/editor/src/scene/selector.rs @@ -25,7 +25,7 @@ use crate::{ type_traits::prelude::*, visitor::prelude::*, }, fxhash::FxHashSet, - graph::{BaseSceneGraph, SceneGraph, SceneGraphNode}, + graph::{SceneGraph, SceneGraphNode}, gui::{ border::BorderBuilder, button::{ButtonBuilder, ButtonMessage}, diff --git a/editor/src/scene_viewer/mod.rs b/editor/src/scene_viewer/mod.rs index df7a3ab70..e2c7b6173 100644 --- a/editor/src/scene_viewer/mod.rs +++ b/editor/src/scene_viewer/mod.rs @@ -24,7 +24,7 @@ use crate::{ core::{color::Color, math::Rect, pool::Handle, uuid::Uuid}, engine::Engine, fxhash::FxHashMap, - graph::{BaseSceneGraph, SceneGraph, SceneGraphNode}, + graph::{SceneGraph, SceneGraphNode}, graphics::PolygonFillMode, gui::{ border::BorderBuilder, diff --git a/editor/src/ui_scene/bbcode.rs b/editor/src/ui_scene/bbcode.rs index 11b124231..dc9e65d66 100644 --- a/editor/src/ui_scene/bbcode.rs +++ b/editor/src/ui_scene/bbcode.rs @@ -5,11 +5,10 @@ use crate::{ ui_scene::{commands::UiSceneContext, UiScene}, Message, }; -use fyrox::graph::SceneGraph; use fyrox::{ core::{pool::Handle, variable::InheritableVariable}, engine::Engine, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ formatted_text::{RunSet, WrapMode}, message::UiMessage, diff --git a/editor/src/ui_scene/clipboard.rs b/editor/src/ui_scene/clipboard.rs index 0b5de0e16..9cf916676 100644 --- a/editor/src/ui_scene/clipboard.rs +++ b/editor/src/ui_scene/clipboard.rs @@ -19,7 +19,7 @@ // SOFTWARE. use crate::fyrox::core::pool::Handle; -use crate::fyrox::graph::BaseSceneGraph; +use crate::fyrox::graph::SceneGraph; use crate::fyrox::gui::{UiNode, UserInterface}; use crate::ui_scene::selection::UiSelection; use std::collections::HashMap; diff --git a/editor/src/ui_scene/commands/graph.rs b/editor/src/ui_scene/commands/graph.rs index a18dd8c8f..6245b8687 100644 --- a/editor/src/ui_scene/commands/graph.rs +++ b/editor/src/ui_scene/commands/graph.rs @@ -21,7 +21,7 @@ //! Ui graph manipulation commands. use crate::command::{CommandContext, CommandTrait}; -use crate::fyrox::graph::{BaseSceneGraph, LinkScheme, SceneGraphNode}; +use crate::fyrox::graph::{LinkScheme, SceneGraph, SceneGraphNode}; use crate::fyrox::{ core::pool::Handle, gui::{SubGraph, UiNode, UserInterface}, diff --git a/editor/src/ui_scene/interaction/mod.rs b/editor/src/ui_scene/interaction/mod.rs index 0f597d95e..3add8df0c 100644 --- a/editor/src/ui_scene/interaction/mod.rs +++ b/editor/src/ui_scene/interaction/mod.rs @@ -19,7 +19,7 @@ // SOFTWARE. use crate::{ - fyrox::graph::BaseSceneGraph, + fyrox::graph::SceneGraph, fyrox::{ core::{ algebra::Vector2, diff --git a/editor/src/ui_scene/interaction/move_mode.rs b/editor/src/ui_scene/interaction/move_mode.rs index 264c17590..c063bc3a7 100644 --- a/editor/src/ui_scene/interaction/move_mode.rs +++ b/editor/src/ui_scene/interaction/move_mode.rs @@ -24,7 +24,7 @@ use crate::fyrox::{ TypeUuidProvider, }, engine::Engine, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{BuildContext, UiNode}, }; use crate::{ diff --git a/editor/src/ui_scene/menu.rs b/editor/src/ui_scene/menu.rs index afacef944..16c078578 100644 --- a/editor/src/ui_scene/menu.rs +++ b/editor/src/ui_scene/menu.rs @@ -19,7 +19,7 @@ // SOFTWARE. use crate::{ - fyrox::graph::{BaseSceneGraph, SceneGraphNode}, + fyrox::graph::{SceneGraph, SceneGraphNode}, fyrox::{ core::pool::Handle, gui::{ diff --git a/editor/src/ui_scene/mod.rs b/editor/src/ui_scene/mod.rs index d8c9b1c6d..5628ce632 100644 --- a/editor/src/ui_scene/mod.rs +++ b/editor/src/ui_scene/mod.rs @@ -41,7 +41,7 @@ use crate::{ }, engine::Engine, fxhash::FxHashSet, - graph::{BaseSceneGraph, SceneGraph}, + graph::SceneGraph, gui::{ brush::Brush, draw::{CommandTexture, Draw}, diff --git a/editor/src/ui_scene/selection.rs b/editor/src/ui_scene/selection.rs index f256976ff..d04d89c10 100644 --- a/editor/src/ui_scene/selection.rs +++ b/editor/src/ui_scene/selection.rs @@ -24,7 +24,7 @@ use crate::{ fyrox::{ core::{pool::Handle, reflect::Reflect, some_or_return}, engine::Engine, - graph::{BaseSceneGraph, SceneGraphNode}, + graph::{SceneGraph, SceneGraphNode}, gui::{inspector::PropertyChanged, UiNode, UserInterface}, scene::SceneContainer, }, diff --git a/editor/src/ui_scene/utils.rs b/editor/src/ui_scene/utils.rs index bde398aab..c01dfb598 100644 --- a/editor/src/ui_scene/utils.rs +++ b/editor/src/ui_scene/utils.rs @@ -25,7 +25,7 @@ use crate::fyrox::{ futures::executor::block_on, make_pretty_type_name, make_relative_path, pool::ErasedHandle, pool::Handle, reflect::Reflect, }, - graph::{BaseSceneGraph, SceneGraph}, + graph::SceneGraph, gui::{ border::Border, button::Button, canvas::Canvas, check_box::CheckBox, file_browser::FileBrowser, grid::Grid, image::Image, inspector::Inspector, diff --git a/editor/src/utils/mod.rs b/editor/src/utils/mod.rs index fdaefb81f..1e2fe70a0 100644 --- a/editor/src/utils/mod.rs +++ b/editor/src/utils/mod.rs @@ -23,7 +23,7 @@ use crate::{ core::{ algebra::Vector2, color::Color, pool::ErasedHandle, pool::Handle, visitor::Visitor, }, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ brush::Brush, button::ButtonBuilder, diff --git a/editor/src/world/graph.rs b/editor/src/world/graph.rs index 6a7247e53..a3597657a 100644 --- a/editor/src/world/graph.rs +++ b/editor/src/world/graph.rs @@ -28,7 +28,7 @@ use crate::{ make_relative_path, pool::{ErasedHandle, Handle}, }, - graph::{BaseSceneGraph, SceneGraph, SceneGraphNode}, + graph::{SceneGraph, SceneGraphNode}, resource::model::{Model, ModelResourceExtension}, scene::{node::Node, Scene}, }, diff --git a/editor/src/world/item.rs b/editor/src/world/item.rs index c3f75ec79..90f8bb440 100644 --- a/editor/src/world/item.rs +++ b/editor/src/world/item.rs @@ -24,7 +24,7 @@ use crate::{ algebra::Vector2, color::Color, pool::ErasedHandle, pool::Handle, reflect::prelude::*, type_traits::prelude::*, uuid_provider, visitor::prelude::*, }, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ brush::Brush, draw::{CommandTexture, Draw, DrawingContext}, diff --git a/editor/src/world/menu.rs b/editor/src/world/menu.rs index 388feda0d..c36878be1 100644 --- a/editor/src/world/menu.rs +++ b/editor/src/world/menu.rs @@ -24,7 +24,7 @@ use crate::{ asset::untyped::UntypedResource, core::{algebra::Vector2, algebra::Vector3, pool::Handle, reflect::Reflect}, engine::SerializationContext, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ constructor::WidgetConstructorContainer, file_browser::FileSelectorMessage, diff --git a/editor/src/world/mod.rs b/editor/src/world/mod.rs index 4a449194d..f1c21a04d 100644 --- a/editor/src/world/mod.rs +++ b/editor/src/world/mod.rs @@ -23,7 +23,7 @@ use crate::{ asset::item::AssetItem, fyrox::{ core::pool::{ErasedHandle, Handle}, - graph::{BaseSceneGraph, SceneGraph}, + graph::SceneGraph, gui::{ border::BorderBuilder, button::{ButtonBuilder, ButtonMessage}, diff --git a/editor/src/world/selection.rs b/editor/src/world/selection.rs index a5ee41605..a62157fb0 100644 --- a/editor/src/world/selection.rs +++ b/editor/src/world/selection.rs @@ -28,7 +28,7 @@ use crate::{ some_or_return, }, engine::Engine, - graph::BaseSceneGraph, + graph::SceneGraph, gui::inspector::PropertyChanged, scene::{graph::Graph, node::Node, SceneContainer}, }, diff --git a/fyrox-graph/src/lib.rs b/fyrox-graph/src/lib.rs index 9a2300cd2..0e4bfa8ab 100644 --- a/fyrox-graph/src/lib.rs +++ b/fyrox-graph/src/lib.rs @@ -25,11 +25,11 @@ pub mod constructor; pub mod prelude { - pub use crate::{AbstractSceneGraph, BaseSceneGraph, SceneGraph}; + pub use crate::SceneGraph; } use fxhash::FxHashMap; -use fyrox_core::pool::{ErasedHandle, ObjectOrVariant, PayloadContainer, PoolError}; +use fyrox_core::pool::{ObjectOrVariant, PayloadContainer, PoolError}; use fyrox_core::reflect::ReflectHandle; use fyrox_core::{ log::{Log, MessageKind}, @@ -468,11 +468,7 @@ fn reset_property_modified_flag(entity: &mut dyn Reflect, path: &str) { }) } -pub trait AbstractSceneNode: ComponentProvider + Reflect + NameProvider {} - -impl AbstractSceneNode for T {} - -pub trait SceneGraphNode: AbstractSceneNode + Clone + 'static { +pub trait SceneGraphNode: ComponentProvider + Reflect + NameProvider + Clone + 'static { type Base: Clone; type SceneGraph: SceneGraph; type ResourceData: PrefabData; @@ -674,21 +670,11 @@ impl Default for LinkScheme { } } -pub trait AbstractSceneGraph: 'static { - fn try_get_node_untyped( - &self, - handle: ErasedHandle, - ) -> Result<&dyn AbstractSceneNode, PoolError>; - fn try_get_node_untyped_mut( - &mut self, - handle: ErasedHandle, - ) -> Result<&mut dyn AbstractSceneNode, PoolError>; -} - -/// BaseSceneGraph is a dyn-compatible trait for all scene graphs to implement. -/// Methods that would not be dyn-compatible are available through the -/// [`SceneGraph`] trait. -pub trait BaseSceneGraph: AbstractSceneGraph { +/// SceneGraph is a non-dyn-compatible trait for all scene graphs to implement. +/// To use a scene graph as a dyn object, use `dyn SceneGraph` because +/// [`SceneGraph`] is dyn-compatible. +pub trait SceneGraph: 'static { + type ObjectType: Sized; type Prefab: PrefabData; type NodeContainer: PayloadContainer; type Node: SceneGraphNode; @@ -838,13 +824,7 @@ pub trait BaseSceneGraph: AbstractSceneGraph { } } } -} -/// SceneGraph is a non-dyn-compatible trait for all scene graphs to implement. -/// To use a scene graph as a dyn object, use `dyn BaseSceneGraph` because -/// [`BaseSceneGraph`] is dyn-compatible. -pub trait SceneGraph: BaseSceneGraph { - type ObjectType: Sized; /// Creates new iterator that iterates over internal collection giving (handle; node) pairs. fn pair_iter(&self) -> impl Iterator, &Self::Node)>; @@ -1478,14 +1458,11 @@ where #[cfg(test)] mod test { - use crate::{ - AbstractSceneGraph, AbstractSceneNode, BaseSceneGraph, NodeHandleMap, NodeMapping, - PrefabData, SceneGraph, SceneGraphNode, - }; + use crate::{NodeHandleMap, NodeMapping, PrefabData, SceneGraph, SceneGraphNode}; use fyrox_core::pool::{ObjectOrVariant, ObjectOrVariantHelper, PoolError}; use fyrox_core::{ define_as_any_trait, - pool::{ErasedHandle, Handle, PayloadContainer, Pool}, + pool::{Handle, PayloadContainer, Pool}, reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*, @@ -1812,27 +1789,8 @@ mod test { } } - impl AbstractSceneGraph for Graph { - fn try_get_node_untyped( - &self, - handle: ErasedHandle, - ) -> Result<&dyn AbstractSceneNode, PoolError> { - self.nodes - .try_borrow(handle.into()) - .map(|n| n as &dyn AbstractSceneNode) - } - - fn try_get_node_untyped_mut( - &mut self, - handle: ErasedHandle, - ) -> Result<&mut dyn AbstractSceneNode, PoolError> { - self.nodes - .try_borrow_mut(handle.into()) - .map(|n| n as &mut dyn AbstractSceneNode) - } - } - - impl BaseSceneGraph for Graph { + impl SceneGraph for Graph { + type ObjectType = Node; type Prefab = Graph; type NodeContainer = NodeContainer; type Node = Node; @@ -1932,10 +1890,7 @@ mod test { .try_borrow(handle) .map(|n| n.0.deref().type_name()) } - } - impl SceneGraph for Graph { - type ObjectType = Node; fn pair_iter(&self) -> impl Iterator, &Self::Node)> { self.nodes.pair_iter() } diff --git a/fyrox-impl/src/engine/hotreload.rs b/fyrox-impl/src/engine/hotreload.rs index caad15ef7..73b514509 100644 --- a/fyrox-impl/src/engine/hotreload.rs +++ b/fyrox-impl/src/engine/hotreload.rs @@ -39,7 +39,7 @@ use crate::{ }; use fyrox_core::dyntype::DynTypeConstructorContainer; use fyrox_core::visitor::error::VisitError; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::{ ops::Deref, sync::{mpsc::Sender, Arc}, diff --git a/fyrox-impl/src/engine/mod.rs b/fyrox-impl/src/engine/mod.rs index 43562ab77..ebf9e1b5e 100644 --- a/fyrox-impl/src/engine/mod.rs +++ b/fyrox-impl/src/engine/mod.rs @@ -54,7 +54,7 @@ use crate::{ }, engine::{error::EngineError, input::InputState, task::TaskPoolHandler}, event::Event, - graph::{BaseSceneGraph, NodeMapping, SceneGraph}, + graph::{NodeMapping, SceneGraph}, graphics::error::FrameworkError, gui::{ constructor::WidgetConstructorContainer, @@ -3144,7 +3144,7 @@ mod test { visitor::prelude::*, }, engine::{task::TaskPoolHandler, GraphicsContext, ScriptProcessor}, - graph::BaseSceneGraph, + graph::SceneGraph, scene::{base::BaseBuilder, node::Node, pivot::PivotBuilder, Scene, SceneContainer}, script::{ ScriptContext, ScriptDeinitContext, ScriptMessageContext, ScriptMessagePayload, diff --git a/fyrox-impl/src/renderer/bundle.rs b/fyrox-impl/src/renderer/bundle.rs index 2009d2673..5276ef90f 100644 --- a/fyrox-impl/src/renderer/bundle.rs +++ b/fyrox-impl/src/renderer/bundle.rs @@ -34,7 +34,7 @@ use crate::{ pool::Handle, sstorage::ImmutableString, }, - graph::BaseSceneGraph, + graph::SceneGraph, graphics::{ error::FrameworkError, framebuffer::{GpuFrameBuffer, ResourceBindGroup, ResourceBinding}, @@ -79,7 +79,7 @@ use crate::{ }, }; use fxhash::{FxBuildHasher, FxHashMap, FxHasher}; -use fyrox_graph::{SceneGraph, SceneGraphNode}; +use fyrox_graph::SceneGraphNode; use fyrox_resource::manager::ResourceManager; use std::{ fmt::{Debug, Formatter}, diff --git a/fyrox-impl/src/renderer/mod.rs b/fyrox-impl/src/renderer/mod.rs index 8e06be243..06abe5cad 100644 --- a/fyrox-impl/src/renderer/mod.rs +++ b/fyrox-impl/src/renderer/mod.rs @@ -97,7 +97,7 @@ use crate::{ }; use cache::DynamicSurfaceCache; use fxhash::FxHashMap; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use lazy_static::lazy_static; use observer::{Observer, ObserversCollection}; use resources::RendererResources; diff --git a/fyrox-impl/src/renderer/occlusion/mod.rs b/fyrox-impl/src/renderer/occlusion/mod.rs index 59c485e33..f2c39d875 100644 --- a/fyrox-impl/src/renderer/occlusion/mod.rs +++ b/fyrox-impl/src/renderer/occlusion/mod.rs @@ -32,7 +32,7 @@ use crate::{ pool::Handle, ImmutableString, }, - graph::BaseSceneGraph, + graph::SceneGraph, graphics::{ error::FrameworkError, framebuffer::Attachment, diff --git a/fyrox-impl/src/renderer/visibility.rs b/fyrox-impl/src/renderer/visibility.rs index bdab8e2a3..5e6051fe4 100644 --- a/fyrox-impl/src/renderer/visibility.rs +++ b/fyrox-impl/src/renderer/visibility.rs @@ -22,7 +22,7 @@ use crate::{ core::{algebra::Vector3, pool::Handle}, - graph::BaseSceneGraph, + graph::SceneGraph, graphics::{ error::FrameworkError, query::{GpuQuery, QueryKind, QueryResult}, diff --git a/fyrox-impl/src/resource/fbx/mod.rs b/fyrox-impl/src/resource/fbx/mod.rs index b622124ad..939656e1a 100644 --- a/fyrox-impl/src/resource/fbx/mod.rs +++ b/fyrox-impl/src/resource/fbx/mod.rs @@ -41,7 +41,7 @@ use crate::{ math::{self, triangulator::triangulate, RotationOrder}, pool::Handle, }, - graph::BaseSceneGraph, + graph::SceneGraph, material, material::MaterialResourceBinding, resource::{ diff --git a/fyrox-impl/src/resource/gltf/animation.rs b/fyrox-impl/src/resource/gltf/animation.rs index f7699730d..c37f05ebe 100644 --- a/fyrox-impl/src/resource/gltf/animation.rs +++ b/fyrox-impl/src/resource/gltf/animation.rs @@ -32,7 +32,7 @@ use crate::scene::graph::Graph; use crate::scene::mesh::Mesh; use crate::scene::node::Node; use fyrox_animation::track::TrackBinding; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use gltf::animation::util::ReadOutputs; use gltf::animation::Channel; use gltf::animation::{Interpolation, Property}; diff --git a/fyrox-impl/src/resource/gltf/mod.rs b/fyrox-impl/src/resource/gltf/mod.rs index 13aa0e1a9..01b8fd23a 100644 --- a/fyrox-impl/src/resource/gltf/mod.rs +++ b/fyrox-impl/src/resource/gltf/mod.rs @@ -29,8 +29,8 @@ use crate::core::algebra::{Matrix4, Unit}; use crate::core::log::Log; use crate::core::pool::Handle; use crate::core::TypeUuidProvider; -use crate::graph::BaseSceneGraph; use crate::graph::NodeMapping; +use crate::graph::SceneGraph; use crate::gui::core::io::FileError; use crate::material::MaterialResource; use crate::resource::model::{MaterialSearchOptions, Model, ModelImportOptions}; diff --git a/fyrox-impl/src/resource/gltf/node_names.rs b/fyrox-impl/src/resource/gltf/node_names.rs index 012f12bb3..2d444911c 100644 --- a/fyrox-impl/src/resource/gltf/node_names.rs +++ b/fyrox-impl/src/resource/gltf/node_names.rs @@ -22,7 +22,6 @@ use crate::core::log::Log; use crate::core::pool::Handle; use crate::core::NameProvider; use crate::fxhash::{FxHashMap, FxHashSet}; -use crate::graph::BaseSceneGraph; use crate::graph::SceneGraph; use crate::scene::graph::Graph; use crate::scene::node::Node; diff --git a/fyrox-impl/src/resource/model/mod.rs b/fyrox-impl/src/resource/model/mod.rs index 252463def..00f3024bb 100644 --- a/fyrox-impl/src/resource/model/mod.rs +++ b/fyrox-impl/src/resource/model/mod.rs @@ -59,7 +59,7 @@ use crate::{ }, engine::SerializationContext, generic_animation::AnimationContainer, - graph::{BaseSceneGraph, NodeHandleMap, NodeMapping, PrefabData, SceneGraph, SceneGraphNode}, + graph::{NodeHandleMap, NodeMapping, PrefabData, SceneGraph, SceneGraphNode}, resource::fbx::{self, error::FbxError}, scene::{ animation::Animation, base::SceneNodeId, graph::Graph, node::Node, transform::Transform, diff --git a/fyrox-impl/src/scene/animation/absm.rs b/fyrox-impl/src/scene/animation/absm.rs index 125768544..049bb10f8 100644 --- a/fyrox-impl/src/scene/animation/absm.rs +++ b/fyrox-impl/src/scene/animation/absm.rs @@ -41,7 +41,7 @@ use crate::{ }, }; use fyrox_graph::constructor::ConstructorProvider; -use fyrox_graph::{BaseSceneGraph, SceneGraph}; +use fyrox_graph::SceneGraph; use std::ops::{Deref, DerefMut}; /// Scene specific root motion settings. diff --git a/fyrox-impl/src/scene/animation/mod.rs b/fyrox-impl/src/scene/animation/mod.rs index b9d9d6af2..74f4fe210 100644 --- a/fyrox-impl/src/scene/animation/mod.rs +++ b/fyrox-impl/src/scene/animation/mod.rs @@ -41,7 +41,7 @@ use crate::{ }, }; use fyrox_graph::constructor::ConstructorProvider; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::ops::{Deref, DerefMut}; pub mod absm; diff --git a/fyrox-impl/src/scene/base.rs b/fyrox-impl/src/scene/base.rs index 65f3e39ef..277f984ff 100644 --- a/fyrox-impl/src/scene/base.rs +++ b/fyrox-impl/src/scene/base.rs @@ -35,7 +35,7 @@ use crate::{ ImmutableString, }, engine::SerializationContext, - graph::BaseSceneGraph, + graph::SceneGraph, resource::model::ModelResource, scene::{node::Node, transform::Transform}, script::{Script, ScriptTrait}, diff --git a/fyrox-impl/src/scene/camera.rs b/fyrox-impl/src/scene/camera.rs index 55370f6a3..5a694a426 100644 --- a/fyrox-impl/src/scene/camera.rs +++ b/fyrox-impl/src/scene/camera.rs @@ -34,7 +34,7 @@ use crate::{ variable::InheritableVariable, visitor::{Visit, VisitResult, Visitor}, }, - graph::BaseSceneGraph, + graph::SceneGraph, resource::texture::{ TextureKind, TexturePixelKind, TextureResource, TextureResourceExtension, TextureWrapMode, }, diff --git a/fyrox-impl/src/scene/collider.rs b/fyrox-impl/src/scene/collider.rs index 1c9f3b085..8c6ed88d0 100644 --- a/fyrox-impl/src/scene/collider.rs +++ b/fyrox-impl/src/scene/collider.rs @@ -50,7 +50,7 @@ use fyrox_core::algebra::{Isometry3, Translation3}; use fyrox_core::uuid_provider; use fyrox_graph::constructor::ConstructorProvider; -use fyrox_graph::{BaseSceneGraph, SceneGraph}; +use fyrox_graph::SceneGraph; use rapier3d::geometry::{self, ColliderHandle}; use std::fmt::Write; use std::{ diff --git a/fyrox-impl/src/scene/decal.rs b/fyrox-impl/src/scene/decal.rs index 63cbc13ce..04afd015f 100644 --- a/fyrox-impl/src/scene/decal.rs +++ b/fyrox-impl/src/scene/decal.rs @@ -43,7 +43,7 @@ use crate::{ }; use fyrox_graph::constructor::ConstructorProvider; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::ops::{Deref, DerefMut}; /// Decal is an image that gets projected to a geometry of a scene. Blood splatters, bullet holes, scratches diff --git a/fyrox-impl/src/scene/dim2/collider.rs b/fyrox-impl/src/scene/dim2/collider.rs index 44968a1a0..ff7e5609f 100644 --- a/fyrox-impl/src/scene/dim2/collider.rs +++ b/fyrox-impl/src/scene/dim2/collider.rs @@ -36,7 +36,7 @@ use crate::{ visitor::prelude::*, ImmutableString, TypeUuidProvider, }, - graph::BaseSceneGraph, + graph::SceneGraph, scene::{ base::{Base, BaseBuilder}, collider::InteractionGroups, @@ -51,7 +51,6 @@ use crate::{ }; use fyrox_graph::constructor::ConstructorProvider; -use fyrox_graph::SceneGraph; use rapier2d::geometry::ColliderHandle; use std::{ cell::Cell, diff --git a/fyrox-impl/src/scene/dim2/joint.rs b/fyrox-impl/src/scene/dim2/joint.rs index a82b59be0..3958e56b1 100644 --- a/fyrox-impl/src/scene/dim2/joint.rs +++ b/fyrox-impl/src/scene/dim2/joint.rs @@ -44,7 +44,7 @@ use crate::{ use fyrox_core::uuid_provider; use fyrox_graph::constructor::ConstructorProvider; -use fyrox_graph::{BaseSceneGraph, SceneGraph}; +use fyrox_graph::SceneGraph; use rapier2d::dynamics::ImpulseJointHandle; use std::{ cell::{Cell, RefCell}, diff --git a/fyrox-impl/src/scene/dim2/physics.rs b/fyrox-impl/src/scene/dim2/physics.rs index d9d765eb2..e57cb46bc 100644 --- a/fyrox-impl/src/scene/dim2/physics.rs +++ b/fyrox-impl/src/scene/dim2/physics.rs @@ -38,7 +38,7 @@ use crate::{ visitor::prelude::*, BiDirHashMap, ImmutableString, SafeLock, }, - graph::{BaseSceneGraph, SceneGraphNode}, + graph::{SceneGraph, SceneGraphNode}, scene::{ self, collider::{self}, @@ -58,7 +58,6 @@ use crate::{ tilemap::TileMap, }, }; -use fyrox_graph::SceneGraph; pub use rapier2d::geometry::shape::*; use rapier2d::parry::query::DefaultQueryDispatcher; use rapier2d::{ diff --git a/fyrox-impl/src/scene/dim2/rectangle.rs b/fyrox-impl/src/scene/dim2/rectangle.rs index 5df2c4dba..aa7f684ac 100644 --- a/fyrox-impl/src/scene/dim2/rectangle.rs +++ b/fyrox-impl/src/scene/dim2/rectangle.rs @@ -36,7 +36,7 @@ use crate::{ variable::InheritableVariable, visitor::prelude::*, }, - graph::{constructor::ConstructorProvider, BaseSceneGraph}, + graph::{constructor::ConstructorProvider, SceneGraph}, material::{Material, MaterialResource}, renderer::{self, bundle::RenderContext}, scene::{ diff --git a/fyrox-impl/src/scene/dim2/rigidbody.rs b/fyrox-impl/src/scene/dim2/rigidbody.rs index e801be25a..9e10b580e 100644 --- a/fyrox-impl/src/scene/dim2/rigidbody.rs +++ b/fyrox-impl/src/scene/dim2/rigidbody.rs @@ -53,7 +53,7 @@ use crate::{ }; use fyrox_graph::constructor::ConstructorProvider; -use fyrox_graph::{BaseSceneGraph, SceneGraph}; +use fyrox_graph::SceneGraph; use rapier2d::prelude::RigidBodyHandle; use std::{ cell::Cell, diff --git a/fyrox-impl/src/scene/graph/event.rs b/fyrox-impl/src/scene/graph/event.rs index e3ac40e67..86fcbfb82 100644 --- a/fyrox-impl/src/scene/graph/event.rs +++ b/fyrox-impl/src/scene/graph/event.rs @@ -64,7 +64,7 @@ impl GraphEventBroadcaster { /// # use fyrox_impl::scene::graph::event::GraphEvent; /// # use fyrox_impl::scene::graph::Graph; /// # use fyrox_impl::scene::pivot::PivotBuilder; - /// # use fyrox_impl::graph::BaseSceneGraph; + /// # use fyrox_impl::graph::SceneGraph; /// /// let mut graph = Graph::new(); /// diff --git a/fyrox-impl/src/scene/graph/mod.rs b/fyrox-impl/src/scene/graph/mod.rs index 1fe1c64fe..0cf89c6c5 100644 --- a/fyrox-impl/src/scene/graph/mod.rs +++ b/fyrox-impl/src/scene/graph/mod.rs @@ -50,11 +50,11 @@ use crate::{ instant, log::{Log, MessageKind}, math::{aabb::AxisAlignedBoundingBox, Matrix4Ext}, - pool::{ErasedHandle, Handle, MultiBorrowContext, Pool, Ticket}, + pool::{Handle, MultiBorrowContext, Pool, Ticket}, reflect::prelude::*, visitor::{Visit, VisitResult, Visitor}, }, - graph::{AbstractSceneGraph, AbstractSceneNode, BaseSceneGraph, NodeHandleMap, SceneGraph}, + graph::{NodeHandleMap, SceneGraph}, material::{MaterialResourceBinding, MaterialTextureBinding}, resource::model::{Model, ModelResource, ModelResourceExtension}, scene::{ @@ -1429,7 +1429,7 @@ impl Graph { /// # use fyrox_impl::scene::node::Node; /// # use fyrox_impl::scene::graph::Graph; /// # use fyrox_impl::scene::pivot::Pivot; - /// # use fyrox_graph::BaseSceneGraph; + /// # use fyrox_graph::SceneGraph; /// let mut graph = Graph::new(); /// graph.add_node(Node::new(Pivot::default())); /// graph.add_node(Node::new(Pivot::default())); @@ -1453,7 +1453,7 @@ impl Graph { /// # use fyrox_impl::scene::node::Node; /// # use fyrox_impl::scene::graph::Graph; /// # use fyrox_impl::scene::pivot::Pivot; - /// # use fyrox_graph::BaseSceneGraph; + /// # use fyrox_graph::SceneGraph; /// let mut graph = Graph::new(); /// graph.add_node(Node::new(Pivot::default())); /// graph.add_node(Node::new(Pivot::default())); @@ -1911,27 +1911,8 @@ impl Visit for Graph { } } -impl AbstractSceneGraph for Graph { - fn try_get_node_untyped( - &self, - handle: ErasedHandle, - ) -> Result<&dyn AbstractSceneNode, PoolError> { - self.pool - .try_borrow(handle.into()) - .map(|n| n as &dyn AbstractSceneNode) - } - - fn try_get_node_untyped_mut( - &mut self, - handle: ErasedHandle, - ) -> Result<&mut dyn AbstractSceneNode, PoolError> { - self.pool - .try_borrow_mut(handle.into()) - .map(|n| n as &mut dyn AbstractSceneNode) - } -} - -impl BaseSceneGraph for Graph { +impl SceneGraph for Graph { + type ObjectType = Node; type Prefab = Model; type NodeContainer = NodeContainer; type Node = Node; @@ -2085,10 +2066,7 @@ impl BaseSceneGraph for Graph { .try_borrow(handle) .map(|n| n.0.deref().type_name()) } -} -impl SceneGraph for Graph { - type ObjectType = Node; #[inline] fn pair_iter(&self) -> impl Iterator, &Self::Node)> { self.pool.pair_iter() @@ -2130,7 +2108,7 @@ mod test { visitor::prelude::*, }, engine::{self, SerializationContext}, - graph::{BaseSceneGraph, SceneGraph}, + graph::SceneGraph, resource::model::{Model, ModelResourceExtension}, scene::{ base::BaseBuilder, diff --git a/fyrox-impl/src/scene/graph/physics.rs b/fyrox-impl/src/scene/graph/physics.rs index b62c5495d..b810ca8d8 100644 --- a/fyrox-impl/src/scene/graph/physics.rs +++ b/fyrox-impl/src/scene/graph/physics.rs @@ -78,7 +78,7 @@ use std::{ }; use strum_macros::{AsRefStr, EnumString, VariantNames}; -use fyrox_graph::{BaseSceneGraph, SceneGraph, SceneGraphNode}; +use fyrox_graph::{SceneGraph, SceneGraphNode}; pub use rapier3d::geometry::shape::*; use rapier3d::parry::query::DefaultQueryDispatcher; use rapier3d::prelude::FrictionModel; diff --git a/fyrox-impl/src/scene/joint.rs b/fyrox-impl/src/scene/joint.rs index fc7449281..bf556d2e6 100644 --- a/fyrox-impl/src/scene/joint.rs +++ b/fyrox-impl/src/scene/joint.rs @@ -44,7 +44,7 @@ use crate::{ use fyrox_core::algebra::{Isometry3, Vector3}; use fyrox_core::uuid_provider; use fyrox_graph::constructor::ConstructorProvider; -use fyrox_graph::{BaseSceneGraph, SceneGraph}; +use fyrox_graph::SceneGraph; use rapier2d::na::UnitQuaternion; use rapier3d::dynamics::ImpulseJointHandle; use std::cell::RefCell; diff --git a/fyrox-impl/src/scene/light/directional.rs b/fyrox-impl/src/scene/light/directional.rs index b84341928..13b0a59b8 100644 --- a/fyrox-impl/src/scene/light/directional.rs +++ b/fyrox-impl/src/scene/light/directional.rs @@ -49,7 +49,7 @@ use crate::{ }, }; use fyrox_graph::constructor::ConstructorProvider; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::ops::{Deref, DerefMut}; use strum_macros::{AsRefStr, EnumString, VariantNames}; diff --git a/fyrox-impl/src/scene/light/point.rs b/fyrox-impl/src/scene/light/point.rs index ed8998ed4..cbe6c2f9c 100644 --- a/fyrox-impl/src/scene/light/point.rs +++ b/fyrox-impl/src/scene/light/point.rs @@ -59,7 +59,7 @@ use crate::{ }, }; use fyrox_graph::constructor::ConstructorProvider; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::ops::{Deref, DerefMut}; /// See module docs. diff --git a/fyrox-impl/src/scene/light/spot.rs b/fyrox-impl/src/scene/light/spot.rs index d5ac2cad4..c27bbdd7d 100644 --- a/fyrox-impl/src/scene/light/spot.rs +++ b/fyrox-impl/src/scene/light/spot.rs @@ -66,7 +66,7 @@ use crate::{ }, }; use fyrox_graph::constructor::ConstructorProvider; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::ops::{Deref, DerefMut}; /// See module docs. diff --git a/fyrox-impl/src/scene/mesh/mod.rs b/fyrox-impl/src/scene/mesh/mod.rs index 0831f3600..2812be979 100644 --- a/fyrox-impl/src/scene/mesh/mod.rs +++ b/fyrox-impl/src/scene/mesh/mod.rs @@ -34,7 +34,7 @@ use crate::{ visitor::prelude::*, SafeLock, }, - graph::{BaseSceneGraph, SceneGraph}, + graph::SceneGraph, graphics::ElementRange, material::{ Material, MaterialResource, MaterialResourceBinding, MaterialResourceExtension, diff --git a/fyrox-impl/src/scene/navmesh.rs b/fyrox-impl/src/scene/navmesh.rs index 855a1976d..de5a7667e 100644 --- a/fyrox-impl/src/scene/navmesh.rs +++ b/fyrox-impl/src/scene/navmesh.rs @@ -46,7 +46,7 @@ use fyrox_core::algebra::Vector3; use fyrox_core::math::TriangleDefinition; use fyrox_core::parking_lot::{RwLockReadGuard, RwLockWriteGuard}; use fyrox_graph::constructor::ConstructorProvider; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::{ ops::{Deref, DerefMut}, sync::Arc, diff --git a/fyrox-impl/src/scene/particle_system/mod.rs b/fyrox-impl/src/scene/particle_system/mod.rs index f992c545c..314bb862d 100644 --- a/fyrox-impl/src/scene/particle_system/mod.rs +++ b/fyrox-impl/src/scene/particle_system/mod.rs @@ -51,7 +51,7 @@ use crate::{ }, }, }; -use fyrox_graph::{constructor::ConstructorProvider, BaseSceneGraph}; +use fyrox_graph::{constructor::ConstructorProvider, SceneGraph}; use std::{ cmp::Ordering, fmt::Debug, diff --git a/fyrox-impl/src/scene/pivot.rs b/fyrox-impl/src/scene/pivot.rs index ce597c9ef..3519511af 100644 --- a/fyrox-impl/src/scene/pivot.rs +++ b/fyrox-impl/src/scene/pivot.rs @@ -36,7 +36,7 @@ use crate::{ }, }; use fyrox_graph::constructor::ConstructorProvider; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::ops::{Deref, DerefMut}; /// A simplest possible node which represents point in space. diff --git a/fyrox-impl/src/scene/probe.rs b/fyrox-impl/src/scene/probe.rs index ced5c4f55..37ff9bed0 100644 --- a/fyrox-impl/src/scene/probe.rs +++ b/fyrox-impl/src/scene/probe.rs @@ -33,7 +33,7 @@ use crate::{ variable::InheritableVariable, visitor::prelude::*, }, - graph::{constructor::ConstructorProvider, BaseSceneGraph}, + graph::{constructor::ConstructorProvider, SceneGraph}, scene::EnvironmentLightingSource, scene::{ base::{Base, BaseBuilder}, diff --git a/fyrox-impl/src/scene/ragdoll.rs b/fyrox-impl/src/scene/ragdoll.rs index 902fbadef..026fb6066 100644 --- a/fyrox-impl/src/scene/ragdoll.rs +++ b/fyrox-impl/src/scene/ragdoll.rs @@ -35,7 +35,7 @@ use crate::{ variable::InheritableVariable, visitor::prelude::*, }, - graph::BaseSceneGraph, + graph::SceneGraph, scene::{ base::{Base, BaseBuilder}, collider::Collider, diff --git a/fyrox-impl/src/scene/rigidbody.rs b/fyrox-impl/src/scene/rigidbody.rs index c143b7d6b..c5268f34b 100644 --- a/fyrox-impl/src/scene/rigidbody.rs +++ b/fyrox-impl/src/scene/rigidbody.rs @@ -52,7 +52,7 @@ use crate::{ }; use fyrox_core::uuid_provider; use fyrox_graph::constructor::ConstructorProvider; -use fyrox_graph::{BaseSceneGraph, SceneGraph}; +use fyrox_graph::SceneGraph; use rapier3d::{dynamics, prelude::RigidBodyHandle}; use std::{ cell::Cell, diff --git a/fyrox-impl/src/scene/sound/listener.rs b/fyrox-impl/src/scene/sound/listener.rs index c323194a8..038922f10 100644 --- a/fyrox-impl/src/scene/sound/listener.rs +++ b/fyrox-impl/src/scene/sound/listener.rs @@ -40,7 +40,7 @@ use crate::{ }, }; use fyrox_graph::constructor::ConstructorProvider; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::ops::{Deref, DerefMut}; /// Listener represents directional microphone-like device. It receives sound from surroundings diff --git a/fyrox-impl/src/scene/sound/mod.rs b/fyrox-impl/src/scene/sound/mod.rs index 86674f8df..b9536e51f 100644 --- a/fyrox-impl/src/scene/sound/mod.rs +++ b/fyrox-impl/src/scene/sound/mod.rs @@ -60,7 +60,7 @@ pub use fyrox_sound::{ use crate::scene::node::constructor::NodeConstructor; use crate::scene::Scene; use fyrox_graph::constructor::ConstructorProvider; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use fyrox_resource::state::ResourceState; use fyrox_sound::source::SoundSource; use std::{ diff --git a/fyrox-impl/src/scene/sprite.rs b/fyrox-impl/src/scene/sprite.rs index 1cb9431c7..a9ac8bd09 100644 --- a/fyrox-impl/src/scene/sprite.rs +++ b/fyrox-impl/src/scene/sprite.rs @@ -35,7 +35,7 @@ use crate::{ variable::InheritableVariable, visitor::{Visit, VisitResult, Visitor}, }, - graph::{constructor::ConstructorProvider, BaseSceneGraph}, + graph::{constructor::ConstructorProvider, SceneGraph}, material::{Material, MaterialResource}, renderer::{self, bundle::RenderContext}, scene::{ diff --git a/fyrox-impl/src/scene/terrain/mod.rs b/fyrox-impl/src/scene/terrain/mod.rs index b807db7ef..0dc3ef741 100644 --- a/fyrox-impl/src/scene/terrain/mod.rs +++ b/fyrox-impl/src/scene/terrain/mod.rs @@ -61,7 +61,7 @@ use crate::{ }; use fxhash::FxHashMap; use fyrox_core::{uuid_provider, warn}; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use fyrox_resource::untyped::ResourceKind; use half::f16; use image::{imageops::FilterType, ImageBuffer, Luma}; diff --git a/fyrox-impl/src/scene/tilemap/mod.rs b/fyrox-impl/src/scene/tilemap/mod.rs index 5eb7a1cff..0f6c0021e 100644 --- a/fyrox-impl/src/scene/tilemap/mod.rs +++ b/fyrox-impl/src/scene/tilemap/mod.rs @@ -65,7 +65,7 @@ use crate::{ visitor::prelude::*, ImmutableString, SafeLock, }, - graph::{constructor::ConstructorProvider, BaseSceneGraph}, + graph::{constructor::ConstructorProvider, SceneGraph}, material::{Material, MaterialResource, STANDARD_2D}, renderer::{self, bundle::RenderContext}, scene::{ diff --git a/fyrox-impl/src/script/mod.rs b/fyrox-impl/src/script/mod.rs index 08b43e029..d99c11ab2 100644 --- a/fyrox-impl/src/script/mod.rs +++ b/fyrox-impl/src/script/mod.rs @@ -42,7 +42,7 @@ use crate::{ }; use fyrox_core::pool::ObjectOrVariant; pub use fyrox_core_derive::ScriptMessagePayload; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::{ any::{Any, TypeId}, fmt::{Debug, Formatter}, diff --git a/fyrox-scripts/src/camera.rs b/fyrox-scripts/src/camera.rs index 16e14b2e9..4e6b6cbd6 100644 --- a/fyrox-scripts/src/camera.rs +++ b/fyrox-scripts/src/camera.rs @@ -21,7 +21,7 @@ //! Flying camera controller script is used to create flying cameras, that can be rotated via mouse and moved via keyboard keys. //! See [`FlyingCameraController`] docs for more info and usage examples. -use fyrox::graph::BaseSceneGraph; +use fyrox::graph::SceneGraph; use fyrox::plugin::error::GameResult; use fyrox::{ core::{ diff --git a/fyrox-ui/src/build.rs b/fyrox-ui/src/build.rs index 4abba47a5..154fc979b 100644 --- a/fyrox-ui/src/build.rs +++ b/fyrox-ui/src/build.rs @@ -26,11 +26,11 @@ use crate::{ Control, RestrictionEntry, UiNode, UserInterface, }; use fyrox_core::pool::PoolError; -use fyrox_graph::BaseSceneGraph; use std::{ ops::{Index, IndexMut}, sync::mpsc::Sender, }; +use fyrox_graph::SceneGraph; /// Build context is used to decouple explicit UI state modification. Its main use is in the various widget /// builders. Internally, it is just a mutable reference to the UI state. UI can be modified (add nodes, clone, diff --git a/fyrox-ui/src/color/gradient.rs b/fyrox-ui/src/color/gradient.rs index 15e7757d9..7ef64b354 100644 --- a/fyrox-ui/src/color/gradient.rs +++ b/fyrox-ui/src/color/gradient.rs @@ -45,7 +45,7 @@ use crate::{ use crate::message::MessageData; use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor}; -use fyrox_graph::{BaseSceneGraph, SceneGraph}; +use fyrox_graph::SceneGraph; use std::cell::Cell; #[derive(Debug, Clone, PartialEq)] diff --git a/fyrox-ui/src/color/mod.rs b/fyrox-ui/src/color/mod.rs index 4180c8412..957526f44 100644 --- a/fyrox-ui/src/color/mod.rs +++ b/fyrox-ui/src/color/mod.rs @@ -43,7 +43,7 @@ use crate::{ use crate::message::MessageData; use fyrox_core::uuid_provider; use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor}; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use fyrox_material::MaterialResource; use std::{ops::Deref, sync::mpsc::Sender}; diff --git a/fyrox-ui/src/control.rs b/fyrox-ui/src/control.rs index caa27eede..7e978d8a8 100644 --- a/fyrox-ui/src/control.rs +++ b/fyrox-ui/src/control.rs @@ -194,7 +194,7 @@ pub trait Control: /// # ops::{Deref, DerefMut}, /// # }; /// # use fyrox_core::uuid_provider; - /// # use fyrox_graph::BaseSceneGraph; + /// # use fyrox_graph::SceneGraph; /// # /// #[derive(Clone, Visit, Reflect, Debug, ComponentProvider)] /// #[reflect(derived_type = "UiNode")] diff --git a/fyrox-ui/src/curve/mod.rs b/fyrox-ui/src/curve/mod.rs index 6e1291744..e8773f5ca 100644 --- a/fyrox-ui/src/curve/mod.rs +++ b/fyrox-ui/src/curve/mod.rs @@ -55,7 +55,7 @@ use crate::{ use fxhash::FxHashSet; use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor}; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::{ cell::{Cell, RefCell}, sync::mpsc::Sender, diff --git a/fyrox-ui/src/dock/config.rs b/fyrox-ui/src/dock/config.rs index 332500a28..0586f72e7 100644 --- a/fyrox-ui/src/dock/config.rs +++ b/fyrox-ui/src/dock/config.rs @@ -24,7 +24,7 @@ use crate::{ widget::{WidgetBuilder, WidgetMessage}, Orientation, UiNode, UserInterface, }; -use fyrox_graph::{BaseSceneGraph, SceneGraph}; +use fyrox_graph::SceneGraph; use serde::{Deserialize, Serialize}; #[derive(Debug, PartialEq, Clone, Default, Serialize, Deserialize)] diff --git a/fyrox-ui/src/dock/mod.rs b/fyrox-ui/src/dock/mod.rs index 3fe0519bc..6f55b4e48 100644 --- a/fyrox-ui/src/dock/mod.rs +++ b/fyrox-ui/src/dock/mod.rs @@ -38,7 +38,7 @@ use crate::{ }; use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor}; -use fyrox_graph::{BaseSceneGraph, SceneGraph}; +use fyrox_graph::SceneGraph; use std::cell::RefCell; pub mod config; diff --git a/fyrox-ui/src/dock/tile.rs b/fyrox-ui/src/dock/tile.rs index 5dfe89371..e2fffdd45 100644 --- a/fyrox-ui/src/dock/tile.rs +++ b/fyrox-ui/src/dock/tile.rs @@ -39,7 +39,7 @@ use crate::message::MessageData; use core::f32; use fyrox_core::uuid_provider; use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor}; -use fyrox_graph::{BaseSceneGraph, SceneGraph}; +use fyrox_graph::SceneGraph; use std::cell::Cell; #[derive(Debug, Clone, PartialEq)] diff --git a/fyrox-ui/src/dropdown_list.rs b/fyrox-ui/src/dropdown_list.rs index c6eecc082..bd66d496f 100644 --- a/fyrox-ui/src/dropdown_list.rs +++ b/fyrox-ui/src/dropdown_list.rs @@ -44,7 +44,7 @@ use crate::message::MessageData; use crate::popup::Popup; use fyrox_graph::{ constructor::{ConstructorProvider, GraphNodeConstructor}, - BaseSceneGraph, SceneGraph, + SceneGraph, }; use std::sync::mpsc::Sender; diff --git a/fyrox-ui/src/file_browser/fs_tree.rs b/fyrox-ui/src/file_browser/fs_tree.rs index e40f51748..c10012c41 100644 --- a/fyrox-ui/src/file_browser/fs_tree.rs +++ b/fyrox-ui/src/file_browser/fs_tree.rs @@ -29,7 +29,7 @@ use crate::{ widget::WidgetBuilder, BuildContext, RcUiNodeHandle, Thickness, UiNode, UserInterface, VerticalAlignment, }; -use fyrox_graph::{BaseSceneGraph, SceneGraph}; +use fyrox_graph::SceneGraph; use std::{ borrow::Cow, cmp::Ordering, diff --git a/fyrox-ui/src/file_browser/menu.rs b/fyrox-ui/src/file_browser/menu.rs index 33bbfafee..faacefc95 100644 --- a/fyrox-ui/src/file_browser/menu.rs +++ b/fyrox-ui/src/file_browser/menu.rs @@ -37,7 +37,7 @@ use crate::{ window::{WindowBuilder, WindowTitle}, BuildContext, Control, Thickness, UiNode, UserInterface, }; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::{ cell::Cell, ops::{Deref, DerefMut}, diff --git a/fyrox-ui/src/file_browser/mod.rs b/fyrox-ui/src/file_browser/mod.rs index b37fe73d6..8bde9cf85 100644 --- a/fyrox-ui/src/file_browser/mod.rs +++ b/fyrox-ui/src/file_browser/mod.rs @@ -50,7 +50,7 @@ use crate::{ use core::time; use fyrox_graph::{ constructor::{ConstructorProvider, GraphNodeConstructor}, - BaseSceneGraph, SceneGraph, + SceneGraph, }; use notify::{Event, Watcher}; use std::{ diff --git a/fyrox-ui/src/grid.rs b/fyrox-ui/src/grid.rs index 65b2c7feb..97fb66d3b 100644 --- a/fyrox-ui/src/grid.rs +++ b/fyrox-ui/src/grid.rs @@ -37,7 +37,7 @@ use core::f32; use crate::message::MessageData; use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor}; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::cell::RefCell; use strum_macros::{AsRefStr, EnumString, VariantNames}; diff --git a/fyrox-ui/src/inspector/editors/array.rs b/fyrox-ui/src/inspector/editors/array.rs index 81269871d..b95466e41 100644 --- a/fyrox-ui/src/inspector/editors/array.rs +++ b/fyrox-ui/src/inspector/editors/array.rs @@ -40,7 +40,7 @@ use crate::{ }; use crate::message::{DeliveryMode, MessageData}; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::sync::Arc; use std::{any::TypeId, fmt::Debug}; diff --git a/fyrox-ui/src/inspector/editors/collection.rs b/fyrox-ui/src/inspector/editors/collection.rs index a04a20488..af8b14850 100644 --- a/fyrox-ui/src/inspector/editors/collection.rs +++ b/fyrox-ui/src/inspector/editors/collection.rs @@ -42,7 +42,7 @@ use crate::{ }; use crate::message::{DeliveryMode, MessageData}; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::{ any::TypeId, fmt::Debug, diff --git a/fyrox-ui/src/inspector/editors/enumeration.rs b/fyrox-ui/src/inspector/editors/enumeration.rs index 9af433bef..7643c95bc 100644 --- a/fyrox-ui/src/inspector/editors/enumeration.rs +++ b/fyrox-ui/src/inspector/editors/enumeration.rs @@ -43,7 +43,7 @@ use crate::{ widget::{Widget, WidgetBuilder}, BuildContext, Control, Thickness, UiNode, UserInterface, }; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::{ any::TypeId, fmt::{Debug, Formatter}, diff --git a/fyrox-ui/src/inspector/editors/inherit.rs b/fyrox-ui/src/inspector/editors/inherit.rs index 49ba18005..52b3439d6 100644 --- a/fyrox-ui/src/inspector/editors/inherit.rs +++ b/fyrox-ui/src/inspector/editors/inherit.rs @@ -44,7 +44,7 @@ use crate::{ BuildContext, Control, MessageDirection, Thickness, UiNode, UserInterface, VerticalAlignment, Widget, WidgetMessage, }; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::{ any::TypeId, fmt::{Debug, Formatter}, diff --git a/fyrox-ui/src/inspector/editors/inspectable.rs b/fyrox-ui/src/inspector/editors/inspectable.rs index 7dfe40f67..ed6dc17a0 100644 --- a/fyrox-ui/src/inspector/editors/inspectable.rs +++ b/fyrox-ui/src/inspector/editors/inspectable.rs @@ -36,7 +36,7 @@ use crate::{ }; use fyrox_core::pool::Handle; use fyrox_core::PhantomDataSendSync; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::{ any::TypeId, fmt::{Debug, Formatter}, diff --git a/fyrox-ui/src/inspector/editors/style.rs b/fyrox-ui/src/inspector/editors/style.rs index 802f35427..b52223e68 100644 --- a/fyrox-ui/src/inspector/editors/style.rs +++ b/fyrox-ui/src/inspector/editors/style.rs @@ -55,7 +55,7 @@ use crate::{ VerticalAlignment, Widget, }; use fyrox_core::algebra::{Matrix3, Vector2}; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::{ any::{Any, TypeId}, fmt::{Debug, Formatter}, diff --git a/fyrox-ui/src/inspector/mod.rs b/fyrox-ui/src/inspector/mod.rs index 0a17759e8..6c59dedc0 100644 --- a/fyrox-ui/src/inspector/mod.rs +++ b/fyrox-ui/src/inspector/mod.rs @@ -54,7 +54,7 @@ use copypasta::ClipboardProvider; use fyrox_core::{err, log::Log}; use fyrox_graph::{ constructor::{ConstructorProvider, GraphNodeConstructor}, - BaseSceneGraph, SceneGraph, + SceneGraph, }; use std::{ any::{Any, TypeId}, diff --git a/fyrox-ui/src/lib.rs b/fyrox-ui/src/lib.rs index aabe96067..0418a071f 100644 --- a/fyrox-ui/src/lib.rs +++ b/fyrox-ui/src/lib.rs @@ -305,7 +305,7 @@ use crate::{ log::Log, math::Rect, parking_lot::Mutex, - pool::{ErasedHandle, Handle, ObjectOrVariant, Pool, Ticket}, + pool::{Handle, ObjectOrVariant, Pool, Ticket}, reflect::prelude::*, uuid::{uuid, Uuid}, uuid_provider, @@ -329,10 +329,7 @@ use crate::{ use copypasta::ClipboardContext; use fxhash::{FxHashMap, FxHashSet}; pub use fyrox_animation as generic_animation; -use fyrox_graph::{ - AbstractSceneGraph, AbstractSceneNode, BaseSceneGraph, NodeHandleMap, NodeMapping, PrefabData, - SceneGraph, SceneGraphNode, -}; +use fyrox_graph::{NodeHandleMap, NodeMapping, PrefabData, SceneGraph, SceneGraphNode}; use fyrox_resource::{ io::{FsResourceIo, ResourceIo}, manager::ResourceManager, @@ -3504,27 +3501,8 @@ impl PrefabData for UserInterface { } } -impl AbstractSceneGraph for UserInterface { - fn try_get_node_untyped( - &self, - handle: ErasedHandle, - ) -> Result<&dyn AbstractSceneNode, PoolError> { - self.nodes - .try_borrow(handle.into()) - .map(|n| n as &dyn AbstractSceneNode) - } - - fn try_get_node_untyped_mut( - &mut self, - handle: ErasedHandle, - ) -> Result<&mut dyn AbstractSceneNode, PoolError> { - self.nodes - .try_borrow_mut(handle.into()) - .map(|n| n as &mut dyn AbstractSceneNode) - } -} - -impl BaseSceneGraph for UserInterface { +impl SceneGraph for UserInterface { + type ObjectType = UiNode; type Prefab = Self; type NodeContainer = WidgetContainer; type Node = UiNode; @@ -3660,10 +3638,7 @@ impl BaseSceneGraph for UserInterface { .try_borrow(handle) .map(|n| Reflect::type_name(n.0.deref())) } -} -impl SceneGraph for UserInterface { - type ObjectType = UiNode; #[inline] fn pair_iter(&self) -> impl Iterator, &Self::Node)> { self.nodes.pair_iter() @@ -3932,7 +3907,7 @@ mod test_inner { widget::{WidgetBuilder, WidgetMessage}, OsEvent, UserInterface, }; - use fyrox_graph::BaseSceneGraph; + use fyrox_graph::SceneGraph; #[test] fn test_transform_size() { diff --git a/fyrox-ui/src/list_view.rs b/fyrox-ui/src/list_view.rs index b649598fa..0d5aa471a 100644 --- a/fyrox-ui/src/list_view.rs +++ b/fyrox-ui/src/list_view.rs @@ -43,7 +43,7 @@ use crate::{ use crate::message::MessageData; use fyrox_graph::{ constructor::{ConstructorProvider, GraphNodeConstructor}, - BaseSceneGraph, + SceneGraph, }; /// A set of messages that can be used to modify/fetch the state of a [`ListView`] widget at runtime. diff --git a/fyrox-ui/src/log.rs b/fyrox-ui/src/log.rs index 6bc99f12b..e1d70e54a 100644 --- a/fyrox-ui/src/log.rs +++ b/fyrox-ui/src/log.rs @@ -41,7 +41,7 @@ use crate::{ BuildContext, HorizontalAlignment, Orientation, RcUiNodeHandle, Thickness, UiNode, UserInterface, VerticalAlignment, }; -use fyrox_graph::{BaseSceneGraph, SceneGraph, SceneGraphNode}; +use fyrox_graph::{SceneGraph, SceneGraphNode}; use fyrox_texture::TextureResource; use std::sync::mpsc::Receiver; diff --git a/fyrox-ui/src/menu.rs b/fyrox-ui/src/menu.rs index 137201aca..48f78b64a 100644 --- a/fyrox-ui/src/menu.rs +++ b/fyrox-ui/src/menu.rs @@ -48,7 +48,7 @@ use crate::{ use fyrox_core::pool::ObjectOrVariant; use fyrox_graph::{ constructor::{ConstructorProvider, GraphNodeConstructor}, - BaseSceneGraph, SceneGraph, SceneGraphNode, + SceneGraph, SceneGraphNode, }; use std::{ any::TypeId, diff --git a/fyrox-ui/src/nine_patch.rs b/fyrox-ui/src/nine_patch.rs index fb15224a2..806d15978 100644 --- a/fyrox-ui/src/nine_patch.rs +++ b/fyrox-ui/src/nine_patch.rs @@ -34,7 +34,7 @@ use crate::{ use crate::message::MessageData; use fyrox_graph::{ constructor::{ConstructorProvider, GraphNodeConstructor}, - BaseSceneGraph, + SceneGraph, }; use fyrox_material::MaterialResource; use fyrox_texture::{TextureKind, TextureResource}; diff --git a/fyrox-ui/src/numeric.rs b/fyrox-ui/src/numeric.rs index 6b8436ec3..c1576ad2c 100644 --- a/fyrox-ui/src/numeric.rs +++ b/fyrox-ui/src/numeric.rs @@ -48,7 +48,7 @@ use crate::{ use crate::message::MessageData; use fyrox_core::variable::InheritableVariable; use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor}; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::{ cmp::Ordering, fmt::{Debug, Display}, diff --git a/fyrox-ui/src/popup.rs b/fyrox-ui/src/popup.rs index def81a997..21dd01e58 100644 --- a/fyrox-ui/src/popup.rs +++ b/fyrox-ui/src/popup.rs @@ -37,7 +37,7 @@ use crate::{ }; use fyrox_graph::{ constructor::{ConstructorProvider, GraphNodeConstructor}, - BaseSceneGraph, + SceneGraph, }; /// A set of messages for [`Popup`] widget. diff --git a/fyrox-ui/src/scroll_bar.rs b/fyrox-ui/src/scroll_bar.rs index 7da6d96fc..72eac3d79 100644 --- a/fyrox-ui/src/scroll_bar.rs +++ b/fyrox-ui/src/scroll_bar.rs @@ -46,7 +46,7 @@ use crate::{ use fyrox_core::uuid_provider; use fyrox_core::variable::InheritableVariable; use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor}; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; /// A set of messages that can be accepted by [`ScrollBar`] widget. #[derive(Debug, Clone, PartialEq)] diff --git a/fyrox-ui/src/scroll_panel.rs b/fyrox-ui/src/scroll_panel.rs index 1f3be594f..7f250e836 100644 --- a/fyrox-ui/src/scroll_panel.rs +++ b/fyrox-ui/src/scroll_panel.rs @@ -37,7 +37,7 @@ use crate::{ use crate::message::MessageData; use fyrox_core::uuid_provider; use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor}; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; /// A set of messages, that is used to modify the state of a scroll panel. #[derive(Debug, Clone, PartialEq)] diff --git a/fyrox-ui/src/scroll_viewer.rs b/fyrox-ui/src/scroll_viewer.rs index 50a758320..667e5e02e 100644 --- a/fyrox-ui/src/scroll_viewer.rs +++ b/fyrox-ui/src/scroll_viewer.rs @@ -40,7 +40,7 @@ use crate::{ use crate::message::MessageData; use fyrox_graph::{ constructor::{ConstructorProvider, GraphNodeConstructor}, - BaseSceneGraph, + SceneGraph, }; /// A set of messages that could be used to alternate the state of a [`ScrollViewer`] widget. diff --git a/fyrox-ui/src/stack_panel.rs b/fyrox-ui/src/stack_panel.rs index 7e444f861..3b015bc38 100644 --- a/fyrox-ui/src/stack_panel.rs +++ b/fyrox-ui/src/stack_panel.rs @@ -35,7 +35,7 @@ use crate::{ use fyrox_core::uuid_provider; use fyrox_core::variable::InheritableVariable; use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor}; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; /// A set of possible [`StackPanel`] widget messages. #[derive(Debug, Clone, PartialEq, Eq)] diff --git a/fyrox-ui/src/tab_control.rs b/fyrox-ui/src/tab_control.rs index 7d605e55d..c1c3235ea 100644 --- a/fyrox-ui/src/tab_control.rs +++ b/fyrox-ui/src/tab_control.rs @@ -47,7 +47,7 @@ use crate::{ use fyrox_core::variable::InheritableVariable; use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor}; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::{ any::Any, cmp::Ordering, diff --git a/fyrox-ui/src/tree.rs b/fyrox-ui/src/tree.rs index 597927155..aab283546 100644 --- a/fyrox-ui/src/tree.rs +++ b/fyrox-ui/src/tree.rs @@ -46,7 +46,7 @@ use crate::{ use crate::message::MessageData; use fyrox_core::uuid_provider; use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor}; -use fyrox_graph::{BaseSceneGraph, SceneGraph, SceneGraphNode}; +use fyrox_graph::{SceneGraph, SceneGraphNode}; use std::collections::VecDeque; /// Opaque selection state of a tree. diff --git a/fyrox-ui/src/widget.rs b/fyrox-ui/src/widget.rs index c105652b1..9962e837e 100644 --- a/fyrox-ui/src/widget.rs +++ b/fyrox-ui/src/widget.rs @@ -44,7 +44,7 @@ use crate::{ BuildContext, HorizontalAlignment, LayoutEvent, MouseButton, MouseState, RcUiNodeHandle, Thickness, UiNode, UserInterface, VerticalAlignment, }; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use fyrox_material::{Material, MaterialResource}; use fyrox_resource::Resource; use std::{ diff --git a/fyrox-ui/src/window.rs b/fyrox-ui/src/window.rs index b3f90c7e0..64aff9946 100644 --- a/fyrox-ui/src/window.rs +++ b/fyrox-ui/src/window.rs @@ -44,7 +44,7 @@ use crate::{ }; use fyrox_graph::{ constructor::{ConstructorProvider, GraphNodeConstructor}, - BaseSceneGraph, SceneGraph, + SceneGraph, }; use std::cell::RefCell; diff --git a/fyrox-ui/src/wrap_panel.rs b/fyrox-ui/src/wrap_panel.rs index 513173c69..9b5053c13 100644 --- a/fyrox-ui/src/wrap_panel.rs +++ b/fyrox-ui/src/wrap_panel.rs @@ -39,7 +39,7 @@ use core::f32; use fyrox_core::uuid_provider; use fyrox_core::variable::InheritableVariable; use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor}; -use fyrox_graph::BaseSceneGraph; +use fyrox_graph::SceneGraph; use std::{cell::RefCell, ops::Range}; /// A set of possible [`WrapPanel`] widget messages. diff --git a/project-manager/src/settings.rs b/project-manager/src/settings.rs index 8d24d3095..0c88c8fcb 100644 --- a/project-manager/src/settings.rs +++ b/project-manager/src/settings.rs @@ -24,7 +24,7 @@ use fyrox::gui::window::WindowAlignment; use fyrox::{ core::{log::Log, pool::Handle, reflect::prelude::*}, fxhash::FxHashSet, - graph::BaseSceneGraph, + graph::SceneGraph, gui::{ inspector::{ editors::{