From f6462002d4aee63fe2aa835196932f33aac5d857 Mon Sep 17 00:00:00 2001 From: xLinka Date: Wed, 1 May 2024 20:04:27 +0100 Subject: [PATCH] Moved --- .../Interaction/FindGrabbableFromSlot.cs | 0 .../ProtoFlux}/Slots/CreateEmptySlot.cs | 0 .../ProtoFlux}/Users/Avatar/AvatarRootSlot.cs | 0 .../Users/Status/IsUserInSeatedMode.cs | 16 +++++++--------- ProtoFlux/Users/Status/IsUserInSeatedMode.cs | 18 ------------------ 5 files changed, 7 insertions(+), 27 deletions(-) rename {ProtoFlux => ProjectObsidian/ProtoFlux}/Interaction/FindGrabbableFromSlot.cs (100%) rename {ProtoFlux => ProjectObsidian/ProtoFlux}/Slots/CreateEmptySlot.cs (100%) rename {ProtoFlux => ProjectObsidian/ProtoFlux}/Users/Avatar/AvatarRootSlot.cs (100%) delete mode 100644 ProtoFlux/Users/Status/IsUserInSeatedMode.cs diff --git a/ProtoFlux/Interaction/FindGrabbableFromSlot.cs b/ProjectObsidian/ProtoFlux/Interaction/FindGrabbableFromSlot.cs similarity index 100% rename from ProtoFlux/Interaction/FindGrabbableFromSlot.cs rename to ProjectObsidian/ProtoFlux/Interaction/FindGrabbableFromSlot.cs diff --git a/ProtoFlux/Slots/CreateEmptySlot.cs b/ProjectObsidian/ProtoFlux/Slots/CreateEmptySlot.cs similarity index 100% rename from ProtoFlux/Slots/CreateEmptySlot.cs rename to ProjectObsidian/ProtoFlux/Slots/CreateEmptySlot.cs diff --git a/ProtoFlux/Users/Avatar/AvatarRootSlot.cs b/ProjectObsidian/ProtoFlux/Users/Avatar/AvatarRootSlot.cs similarity index 100% rename from ProtoFlux/Users/Avatar/AvatarRootSlot.cs rename to ProjectObsidian/ProtoFlux/Users/Avatar/AvatarRootSlot.cs diff --git a/ProjectObsidian/ProtoFlux/Users/Status/IsUserInSeatedMode.cs b/ProjectObsidian/ProtoFlux/Users/Status/IsUserInSeatedMode.cs index 6d905de..b5ee204 100644 --- a/ProjectObsidian/ProtoFlux/Users/Status/IsUserInSeatedMode.cs +++ b/ProjectObsidian/ProtoFlux/Users/Status/IsUserInSeatedMode.cs @@ -1,20 +1,18 @@ -using FrooxEngine; -using FrooxEngine.ProtoFlux; -using ProtoFlux.Core; +using ProtoFlux.Core; using ProtoFlux.Runtimes.Execution; -namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Locomotion +namespace FrooxEngine.ProtoFlux.Status { [ContinuouslyChanging] - [NodeCategory("Obsidian/Locomotion")] - public class IsUserInSeatedModeNode : ValueFunctionNode + [NodeCategory("ProtoFlux/Obsidian/Status")] + public class IsUserInSeatedModeNode : ValueFunctionNode { public readonly ObjectInput User; - protected override bool Compute(FrooxEngineContext context) + protected override bool Compute(ExecutionContext context) { - var user = User.Evaluate(context); - return user != null && user.InputInterface.SeatedMode; + User user = User.Evaluate(context); + return user == null ? false : user.InputInterface.SeatedMode; } } } \ No newline at end of file diff --git a/ProtoFlux/Users/Status/IsUserInSeatedMode.cs b/ProtoFlux/Users/Status/IsUserInSeatedMode.cs deleted file mode 100644 index b5ee204..0000000 --- a/ProtoFlux/Users/Status/IsUserInSeatedMode.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ProtoFlux.Core; -using ProtoFlux.Runtimes.Execution; - -namespace FrooxEngine.ProtoFlux.Status -{ - [ContinuouslyChanging] - [NodeCategory("ProtoFlux/Obsidian/Status")] - public class IsUserInSeatedModeNode : ValueFunctionNode - { - public readonly ObjectInput User; - - protected override bool Compute(ExecutionContext context) - { - User user = User.Evaluate(context); - return user == null ? false : user.InputInterface.SeatedMode; - } - } -} \ No newline at end of file