Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion editor/src/asset/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ impl AssetBrowser {
if let Some(item) = engine
.user_interfaces
.first_mut()
.try_get(self.context_menu.placement_target)
.try_get_node(self.context_menu.placement_target)
.and_then(|n| n.cast::<AssetItem>())
{
if let Ok(resource) =
Expand Down
2 changes: 1 addition & 1 deletion editor/src/camera/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ impl CameraController {
.try_normalize(f32::EPSILON)
.unwrap_or_default()
.scale(5.0);
if let Some(relative_to) = graph.try_get(relative_to) {
if let Some(relative_to) = graph.try_get_node(relative_to) {
return relative_to
.global_transform()
.try_inverse()
Expand Down
3 changes: 2 additions & 1 deletion editor/src/camera/panel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ use crate::{
send_sync_message, send_sync_messages, Message,
};
use fyrox::core::algebra::Vector2;
use fyrox::graph::BaseSceneGraph;
use fyrox::gui::widget::WidgetMessage;
use fyrox::scene::collider::BitMask;

Expand Down Expand Up @@ -204,7 +205,7 @@ impl CameraPreviewControlPanel {
let node_overrides = game_scene.graph_switches.node_overrides.as_mut().unwrap();

if let Some((camera_handle, original)) = self.camera_state.take() {
if let Some(camera) = scene.graph.try_get_mut(camera_handle) {
if let Some(camera) = scene.graph.try_get_node_mut(camera_handle) {
*camera = original
}

Expand Down
4 changes: 2 additions & 2 deletions editor/src/interaction/navmesh/selection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ impl SelectionContainer for NavmeshSelection {
) {
let game_scene = some_or_return!(controller.downcast_ref::<GameScene>());
let scene = &scenes[game_scene.scene];
let node = scene.graph.try_get(self.navmesh_node).unwrap();
let node = scene.graph.try_get_node(self.navmesh_node).unwrap();
(callback)(node as &dyn Reflect, node.has_inheritance_parent());
}

Expand Down Expand Up @@ -98,7 +98,7 @@ impl SelectionContainer for NavmeshSelection {
ctx.get_mut::<GameSceneContext>()
.scene
.graph
.try_get_mut(navmesh_node)
.try_get_node_mut(navmesh_node)
.map(|n| n as &mut dyn Reflect)
},
))
Expand Down
6 changes: 3 additions & 3 deletions editor/src/plugins/absm/canvas.rs
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ impl AbsmCanvas {
T: 'static,
{
if ui
.try_get(node_handle)
.try_get_node(node_handle)
.is_some_and(|n| n.has_component::<T>())
{
return node_handle;
Expand Down Expand Up @@ -290,8 +290,8 @@ impl AbsmCanvas {
{
if transition_handle == transition.handle() {
if let (Some(source_state), Some(dest_state)) = (
ui.try_get(transition.segment.source),
ui.try_get(transition.segment.dest),
ui.try_get_node(transition.segment.source),
ui.try_get_node(transition.segment.dest),
) {
let source_pos = source_state.center();
let dest_pos = dest_state.center();
Expand Down
12 changes: 6 additions & 6 deletions editor/src/plugins/absm/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ where
N: SceneGraphNode<SceneGraph = G>,
{
graph
.try_get_mut(handle)
.try_get_node_mut(handle)
.and_then(|n| n.component_mut::<InheritableVariable<Machine<Handle<N>>>>())
.map(|v| v.get_value_mut_silent())
}
Expand All @@ -144,12 +144,12 @@ where
N: SceneGraphNode<SceneGraph = G>,
{
let animation_player_handle = *graph
.try_get(handle)
.try_get_node(handle)
.and_then(|n| n.component_ref::<InheritableVariable<Handle<N>>>())
.cloned()?;

graph
.try_get_mut(animation_player_handle)
.try_get_node_mut(animation_player_handle)
.and_then(|n| n.component_mut::<InheritableVariable<AnimationContainer<Handle<N>>>>())
.map(|ac| (animation_player_handle, ac.get_value_mut_silent()))
}
Expand All @@ -160,7 +160,7 @@ where
N: SceneGraphNode<SceneGraph = G>,
{
graph
.try_get(handle)
.try_get_node(handle)
.and_then(|n| n.component_ref::<InheritableVariable<Machine<Handle<N>>>>())
.map(|v| v.get_value_ref())
}
Expand All @@ -174,11 +174,11 @@ where
N: SceneGraphNode<SceneGraph = G>,
{
graph
.try_get(handle)
.try_get_node(handle)
.and_then(|n| n.component_ref::<InheritableVariable<Handle<N>>>())
.and_then(|ap| {
graph
.try_get(**ap)
.try_get_node(**ap)
.and_then(|n| {
n.component_ref::<InheritableVariable<AnimationContainer<Handle<N>>>>()
})
Expand Down
2 changes: 1 addition & 1 deletion editor/src/plugins/absm/toolbar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ impl Toolbar {
.cloned()
.filter(|n| {
graph
.try_get(*n)
.try_get_node(*n)
.is_some_and(|n| !unique_nodes.contains(&n.parent()))
})
.collect::<Vec<_>>();
Expand Down
6 changes: 3 additions & 3 deletions editor/src/plugins/animation/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ where
N: SceneGraphNode<SceneGraph = G>,
{
graph
.try_get_mut(handle)
.try_get_node_mut(handle)
.and_then(|n| n.component_mut::<InheritableVariable<AnimationContainer<Handle<N>>>>())
.map(|v| v.get_value_mut_silent())
}
Expand All @@ -192,7 +192,7 @@ where
N: SceneGraphNode<SceneGraph = G>,
{
graph
.try_get(handle)
.try_get_node(handle)
.and_then(|n| {
n.query_component_ref(TypeId::of::<
InheritableVariable<AnimationContainer<Handle<N>>>,
Expand Down Expand Up @@ -454,7 +454,7 @@ impl AnimationEditor {
assert!(node_overrides.insert(selection.animation_player));

let animation_player_node =
graph.try_get_mut(selection.animation_player).unwrap();
graph.try_get_node_mut(selection.animation_player).unwrap();

// HACK. This is unreliable to just use `bool` here. It should be wrapped into
// newtype or something.
Expand Down
2 changes: 1 addition & 1 deletion editor/src/plugins/animation/toolbar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ impl RootMotionDropdownArea {
.content,
MessageDirection::ToWidget,
graph
.try_get(settings.node)
.try_get_node(settings.node)
.map(|n| n.name().to_owned())
.unwrap_or_else(|| String::from("<Unassigned>")),
),
Expand Down
10 changes: 5 additions & 5 deletions editor/src/plugins/animation/track.rs
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ impl TrackList {
if message.destination() == self.property_selector
&& message.direction() == MessageDirection::FromWidget
{
if let Some(node) = graph.try_get(self.selected_node.into()) {
if let Some(node) = graph.try_get_node(self.selected_node.into()) {
for property_path in selected_properties {
node.resolve_path(&property_path.path, &mut |result| match result {
Ok(property) => {
Expand Down Expand Up @@ -1117,7 +1117,7 @@ impl TrackList {
N: SceneGraphNode,
{
let mut descriptors = Vec::new();
if let Some(node) = graph.try_get(node) {
if let Some(node) = graph.try_get_node(node) {
node.as_reflect(&mut |node| {
descriptors = object_to_property_tree("", node, &mut |field: &FieldRef| {
let type_id = field.value.field_value_as_reflect().type_id();
Expand Down Expand Up @@ -1237,7 +1237,7 @@ impl TrackList {
return;
};

let Some(node) = graph.try_get(binding.target()) else {
let Some(node) = graph.try_get_node(binding.target()) else {
Log::err("Invalid node handle!");
return;
};
Expand Down Expand Up @@ -1390,7 +1390,7 @@ impl TrackList {
.with_text(format!(
"{} ({}:{})",
graph
.try_get(model_track_binding.target())
.try_get_node(model_track_binding.target())
.map(|n| n.name())
.unwrap_or_default(),
model_track_binding.target().index(),
Expand Down Expand Up @@ -1581,7 +1581,7 @@ impl TrackList {
}

let mut validation_result = Ok(());
if let Some(target) = graph.try_get(model_track_binding.target()) {
if let Some(target) = graph.try_get_node(model_track_binding.target()) {
if let Some(parent_group) =
self.group_views.get(&model_track_binding.target().into())
{
Expand Down
2 changes: 1 addition & 1 deletion editor/src/plugins/collider/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ impl InteractionMode for ColliderShapeInteractionMode {
ctx.get_mut::<GameSceneContext>()
.scene
.graph
.try_get_mut(collider)
.try_get_node_mut(collider)
.map(|n| n as &mut dyn Reflect)
});
self.message_sender.do_command(command);
Expand Down
4 changes: 2 additions & 2 deletions editor/src/plugins/collider/panel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ fn set_property<T: Reflect>(
ctx.get_mut::<GameSceneContext>()
.scene
.graph
.try_get_mut(selected_collider)
.try_get_node_mut(selected_collider)
.map(|n| n as &mut dyn Reflect)
},
)));
Expand Down Expand Up @@ -199,7 +199,7 @@ impl ColliderControlPanel {
ColliderShape::Capsule(_) => {
let local_center = scene
.graph
.try_get(collider_ref.parent())
.try_get_node(collider_ref.parent())
.map(|p| p.global_transform())
.unwrap_or_default()
.try_inverse()
Expand Down
3 changes: 2 additions & 1 deletion editor/src/plugins/inspector/handlers/node/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ use crate::{
scene::commands::terrain::{AddTerrainLayerCommand, DeleteTerrainLayerCommand},
Command,
};
use fyrox::graph::BaseSceneGraph;

pub struct SceneNodePropertyChangedHandler;

Expand Down Expand Up @@ -83,7 +84,7 @@ impl SceneNodePropertyChangedHandler {
ctx.get_mut::<GameSceneContext>()
.scene
.graph
.try_get_mut(handle)
.try_get_node_mut(handle)
.map(|n| n as &mut dyn Reflect)
})
}
Expand Down
2 changes: 1 addition & 1 deletion editor/src/plugins/inspector/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ fn current_widget_style(
if let Some(ui_selection) = selection.as_ui() {
return ui_scene
.ui
.try_get(ui_selection.widgets[0])
.try_get_node(ui_selection.widgets[0])
.and_then(|n| n.style.clone());
}
}
Expand Down
4 changes: 2 additions & 2 deletions editor/src/plugins/probe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use crate::{
Uuid,
},
engine::Engine,
graph::SceneGraph,
graph::{BaseSceneGraph, SceneGraph},
gui::{
button::{ButtonBuilder, ButtonMessage},
grid::{Column, GridBuilder, Row},
Expand Down Expand Up @@ -218,7 +218,7 @@ impl InteractionMode for ReflectionProbeInteractionMode {
ctx.get_mut::<GameSceneContext>()
.scene
.graph
.try_get_mut(probe.transmute())
.try_get_node_mut(probe.transmute())
.map(|n| n as &mut dyn Reflect)
},
);
Expand Down
9 changes: 5 additions & 4 deletions editor/src/plugins/ragdoll.rs
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ impl RagdollPreset {
apply_offset: bool,
graph: &mut Graph,
) -> Handle<Node> {
if let Some(from_ref) = graph.try_get(from) {
if let Some(from_ref) = graph.try_get_node(from) {
let offset = if apply_offset {
from_ref
.up_vector()
Expand Down Expand Up @@ -364,7 +364,7 @@ impl RagdollPreset {
ragdoll: Handle<Node>,
graph: &mut Graph,
) -> Handle<Node> {
if let (Some(from_ref), Some(to_ref)) = (graph.try_get(from), graph.try_get(to)) {
if let (Some(from_ref), Some(to_ref)) = (graph.try_get_node(from), graph.try_get_node(to)) {
let pos_from = from_ref.global_position();
let pos_to = to_ref.global_position();

Expand Down Expand Up @@ -418,7 +418,7 @@ impl RagdollPreset {
ragdoll: Handle<Node>,
graph: &mut Graph,
) -> Handle<Node> {
if let Some(from_ref) = graph.try_get(from) {
if let Some(from_ref) = graph.try_get_node(from) {
let cuboid = RigidBodyBuilder::new(
BaseBuilder::new()
.with_name(name)
Expand Down Expand Up @@ -458,7 +458,8 @@ impl RagdollPreset {
(self.left_fore_arm, self.left_hand),
(self.left_fore_arm, self.right_hand),
] {
if let (Some(upper_ref), Some(lower_ref)) = (graph.try_get(upper), graph.try_get(lower))
if let (Some(upper_ref), Some(lower_ref)) =
(graph.try_get_node(upper), graph.try_get_node(lower))
{
base_size = (upper_ref.global_position() - lower_ref.global_position()).norm();
break;
Expand Down
2 changes: 1 addition & 1 deletion editor/src/plugins/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ impl SettingsWindow {
self.sync_to_model(ui, settings, sender, engine.resource_manager.clone());
}

if let Some(node) = ui.try_get(message.destination()) {
if let Some(node) = ui.try_get_node(message.destination()) {
if let Some(user_data) = node.user_data_cloned::<GroupName>() {
let inspector = ui.try_get_of_type::<Inspector>(self.inspector).unwrap();

Expand Down
6 changes: 3 additions & 3 deletions editor/src/plugins/tilemap/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ impl TileMapEditorPlugin {
let entry = editor.scenes.current_scene_entry_mut()?;
let game_scene = entry.controller.downcast_mut::<GameScene>()?;
let scene = &mut editor.engine.scenes[game_scene.scene];
let node = scene.graph.try_get_mut(self.tile_map)?;
let node = scene.graph.try_get_node_mut(self.tile_map)?;
node.component_mut::<TileMap>()
}
fn open_panel_for_tile_set(
Expand Down Expand Up @@ -725,7 +725,7 @@ impl EditorPlugin for TileMapEditorPlugin {

let palette = self.state.lock().selection_palette();
if let Some(palette) = ui
.try_get_mut(palette)
.try_get_node_mut(palette)
.and_then(|p| p.cast_mut::<PaletteWidget>())
{
palette.sync_selection_to_model();
Expand Down Expand Up @@ -873,7 +873,7 @@ impl EditorPlugin for TileMapEditorPlugin {
// Remove the editor data from the currently selected tile map, so it will render as normal.
if let Some(tile_map) = scene
.graph
.try_get_mut(self.tile_map)
.try_get_node_mut(self.tile_map)
.and_then(|n| n.component_mut::<TileMap>())
{
tile_map.before_effects.clear();
Expand Down
4 changes: 2 additions & 2 deletions editor/src/scene/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ impl GameScene {

if let Some(selection) = editor_selection.as_graph() {
for &node in selection.nodes() {
if let Some(node) = scene.graph.try_get(node) {
if let Some(node) = scene.graph.try_get_node(node) {
scene.drawing_context.draw_oob(
&node.local_bounding_box(),
node.global_transform(),
Expand Down Expand Up @@ -1049,7 +1049,7 @@ impl SceneController for GameScene {
UiMessage::with_data(HandlePropertyEditorNameMessage(
scene
.graph
.try_get((*handle).into())
.try_get_node((*handle).into())
.map(|n| n.name_owned()),
))
.with_destination(*view)
Expand Down
4 changes: 2 additions & 2 deletions editor/src/ui_scene/interaction/move_mode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ impl InteractionMode for MoveWidgetsInteractionMode {
.widgets
.iter()
.filter_map(|w| {
if let Some(widget_ref) = ui_scene.ui.try_get(*w) {
if let Some(widget_ref) = ui_scene.ui.try_get_node(*w) {
if !in_bounds && widget_ref.screen_bounds().contains(mouse_position) {
in_bounds = true;
}
Expand Down Expand Up @@ -179,7 +179,7 @@ impl InteractionMode for MoveWidgetsInteractionMode {
let new_screen_space_position = mouse_position - entry.delta;
let parent_inv_transform = ui_scene
.ui
.try_get(ui_scene.ui.node(entry.widget).parent)
.try_get_node(ui_scene.ui.node(entry.widget).parent)
.and_then(|w| w.visual_transform().try_inverse())
.unwrap_or_default();
let new_local_position = parent_inv_transform.transform_point(&Point2::new(
Expand Down
2 changes: 1 addition & 1 deletion editor/src/ui_scene/menu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ fn resource_path_of_first_selected_node(
) -> Option<PathBuf> {
if let Some(ui_selection) = editor_selection.as_ui() {
if let Some(first) = ui_selection.widgets.first() {
if let Some(resource) = ui_scene.ui.try_get(*first).and_then(|n| n.resource()) {
if let Some(resource) = ui_scene.ui.try_get_node(*first).and_then(|n| n.resource()) {
return resource_manager.resource_path(resource.as_ref());
}
}
Expand Down
Loading