Merge branch 'main' of https://github.com/LeCloutPanda/Project-Obsidian

Xlinka · May 1, 2024 · 8d6f7e9 · 8d6f7e9
2 parents cca27f2 + 99f5dbf
commit 8d6f7e9
Show file tree

Hide file tree

Showing 17 changed files with 107 additions and 13 deletions.
diff --git a/ProjectObsidian/ProtoFlux/Devices/ViveTrackerBattery.cs b/ProjectObsidian/ProtoFlux/Devices/ViveTrackerBattery.cs
@@ -9,7 +9,7 @@
 using ProtoFlux.Runtimes.Execution;
 using Obsidian;
 
-namespace ProtoFlux.Runtimes.Execution.Nodes.FrooxEngine.Input;
+namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Devices;
 
 [NodeCategory("Obsidian/Devices")]
 public class ViveTrackerBattery : VoidNode<FrooxEngineContext>

diff --git a/ProjectObsidian/ProtoFlux/Strings/CountSubstring.cs b/ProjectObsidian/ProtoFlux/Strings/CountSubstring.cs
@@ -4,7 +4,7 @@
 using ProtoFlux.Core;
 using ProtoFlux.Runtimes.Execution;
 
-namespace ProtoFlux.Runtimes.Execution.Nodes.Strings
+namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Strings
 {
     [NodeCategory("Obsidian/String")]
     public class CountSubstringNode : ValueFunctionNode<FrooxEngineContext, int>

diff --git a/ProjectObsidian/ProtoFlux/Strings/DecodeBase64Node.cs b/ProjectObsidian/ProtoFlux/Strings/DecodeBase64Node.cs
@@ -5,7 +5,7 @@
 using ProtoFlux.Core;
 using ProtoFlux.Runtimes.Execution;
 
-namespace ProtoFlux.Runtimes.Execution.Nodes.Strings
+namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Strings
 {
     [NodeCategory("Obsidian/String")]
     public class DecodeBase64Node : ObjectFunctionNode<FrooxEngineContext, string>

diff --git a/ProjectObsidian/ProtoFlux/Strings/DecodeMorseNode.cs b/ProjectObsidian/ProtoFlux/Strings/DecodeMorseNode.cs
@@ -6,7 +6,7 @@
 using ProtoFlux.Core;
 using ProtoFlux.Runtimes.Execution;
 
-namespace ProtoFlux.Runtimes.Execution.Nodes.Strings
+namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Strings
 {
     [NodeCategory("Obsidian/String")]
     public class DecodeMorseNode : ObjectFunctionNode<FrooxEngineContext, string>

diff --git a/ProjectObsidian/ProtoFlux/Strings/EncodeBase64Node.cs b/ProjectObsidian/ProtoFlux/Strings/EncodeBase64Node.cs
@@ -5,7 +5,7 @@
 using ProtoFlux.Core;
 using ProtoFlux.Runtimes.Execution;
 
-namespace ProtoFlux.Runtimes.Execution.Nodes.Strings
+namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Strings
 {
     [NodeCategory("Obsidian/String")]
     public class EncodeBase64Node : ObjectFunctionNode<FrooxEngineContext, string>

diff --git a/ProjectObsidian/ProtoFlux/Strings/EncodeMD5.cs b/ProjectObsidian/ProtoFlux/Strings/EncodeMD5.cs
@@ -6,7 +6,7 @@
 using ProtoFlux.Core;
 using ProtoFlux.Runtimes.Execution;
 
-namespace ProtoFlux.Runtimes.Execution.Nodes.Strings
+namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Strings
 {
     [NodeCategory("Obsidian/String")]
     public class EncodeMD5Node : ObjectFunctionNode<FrooxEngineContext, string>

diff --git a/ProjectObsidian/ProtoFlux/Strings/EncodeMorse.cs b/ProjectObsidian/ProtoFlux/Strings/EncodeMorse.cs
@@ -6,7 +6,7 @@
 using ProtoFlux.Runtimes.Execution;
 using Obsidian;
 
-namespace ProtoFlux.Runtimes.Execution.Nodes.Strings
+namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Strings
 {
     [NodeCategory("Obsidian/String")]
     public class EncodeMorseNode : ObjectFunctionNode<FrooxEngineContext, string>

diff --git a/ProjectObsidian/ProtoFlux/Strings/EncodeSHA256.cs b/ProjectObsidian/ProtoFlux/Strings/EncodeSHA256.cs
@@ -6,7 +6,7 @@
 using ProtoFlux.Core;
 using ProtoFlux.Runtimes.Execution;
 
-namespace ProtoFlux.Runtimes.Execution.Nodes.Strings
+namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Strings
 {
     [NodeCategory("Obsidian/String")]
     public class EncodeSha256Node : ObjectFunctionNode<FrooxEngineContext, string>

diff --git a/ProjectObsidian/ProtoFlux/Strings/HMAC.cs b/ProjectObsidian/ProtoFlux/Strings/HMAC.cs
@@ -6,7 +6,7 @@
 using ProtoFlux.Core;
 using ProtoFlux.Runtimes.Execution;
 
-namespace ProtoFlux.Runtimes.Execution.Nodes.Strings
+namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Strings
 {
     public enum HashFunction
     {

diff --git a/ProjectObsidian/ProtoFlux/Strings/HammingDistanceNode.cs b/ProjectObsidian/ProtoFlux/Strings/HammingDistanceNode.cs
@@ -4,7 +4,7 @@
 using ProtoFlux.Core;
 using ProtoFlux.Runtimes.Execution;
 
-namespace ProtoFlux.Runtimes.Execution.Nodes.Strings
+namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Strings
 {
     [NodeCategory("Obsidian/String")]
     public class HammingDistanceNode : ObjectFunctionNode<FrooxEngineContext, int?>

diff --git a/ProjectObsidian/ProtoFlux/Strings/HammingDistanceNonNullableNode.cs b/ProjectObsidian/ProtoFlux/Strings/HammingDistanceNonNullableNode.cs
@@ -4,7 +4,7 @@
 using ProtoFlux.Core;
 using ProtoFlux.Runtimes.Execution;
 
-namespace ProtoFlux.Runtimes.Execution.Nodes.Strings
+namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Strings
 {
     [NodeCategory("Obsidian/String")]
     public class HammingDistanceNonNullableNode : ValueFunctionNode<FrooxEngineContext, int>

diff --git a/ProjectObsidian/ProtoFlux/Users/Status/IsUserInNoclipNode.cs b/ProjectObsidian/ProtoFlux/Users/Status/IsUserInNoclipNode.cs
@@ -3,7 +3,7 @@
 using ProtoFlux.Core;
 using ProtoFlux.Runtimes.Execution;
 
-namespace ProtoFlux.Runtimes.Execution.Nodes.FrooxEngine.Locomotion
+namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Locomotion
 {
     [ContinuouslyChanging]
     [NodeCategory("Obsidian/Locomotion")]

diff --git a/ProjectObsidian/ProtoFlux/Users/Status/IsUserInSeatedMode.cs b/ProjectObsidian/ProtoFlux/Users/Status/IsUserInSeatedMode.cs
@@ -3,7 +3,7 @@
 using ProtoFlux.Core;
 using ProtoFlux.Runtimes.Execution;
 
-namespace ProtoFlux.Runtimes.Execution.Nodes.FrooxEngine.Locomotion
+namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Locomotion
 {
     [ContinuouslyChanging]
     [NodeCategory("Obsidian/Locomotion")]

diff --git a/ProtoFlux/Interaction/FindGrabbableFromSlot.cs b/ProtoFlux/Interaction/FindGrabbableFromSlot.cs
@@ -0,0 +1,19 @@
+using FrooxEngine;
+using ProtoFlux.Core;
+using ProtoFlux.Runtimes.Execution;
+
+namespace ProtoFlux.Users.Avatar
+{
+    [ContinuouslyChanging]
+    [NodeCategory("ProtoFlux/Obsidian/Avatar")]
+    public class FindGrabbableFromSlot : ObjectFunctionNode<ExecutionContext, IGrabbable>
+    {
+        public readonly ObjectInput<Slot> Slot;
+
+        protected override IGrabbable Compute(ExecutionContext context)
+        {
+            Slot slot = Slot.Evaluate(context);
+            return slot == null ? null : slot.GetComponentInParents<Grabbable>();
+        }
+    }
+}
diff --git a/ProtoFlux/Slots/CreateEmptySlot.cs b/ProtoFlux/Slots/CreateEmptySlot.cs
@@ -0,0 +1,33 @@
+using FrooxEngine;
+using FrooxEngine.ProtoFlux;
+using ProtoFlux.Core;
+using ProtoFlux.Runtimes.Execution;
+
+namespace ProtoFlux.Users.Avatar
+{
+    [ContinuouslyChanging]
+    [NodeCategory("ProtoFlux/Obsidian/Slots")]
+    public class CreateEmptySlot : ActionBreakableFlowNode<FrooxEngineContext>
+    {
+        public readonly ObjectInput<Slot> Parent;
+        public readonly ObjectInput<string> Name;
+        public readonly ObjectInput<string> Tag;
+        public readonly ValueInput<bool> Persistent;
+        public readonly ValueInput<bool> Active;
+
+        public readonly ObjectOutput<Slot> Slot;
+
+        protected override bool Do(FrooxEngineContext context)
+        {
+            Slot slot = context.LocalUser.LocalUserSpace.AddSlot();
+            slot.Parent = Parent.Evaluate(context);
+            slot.Name = Name.Evaluate(context);
+            slot.Tag = Tag.Evaluate(context);
+            slot.PersistentSelf = Persistent.Evaluate(context);
+            slot.ActiveSelf = Active.Evaluate(context);
+
+            Slot.Write(slot, context);
+            return true;
+        }
+    }
+}
diff --git a/ProtoFlux/Users/Avatar/AvatarRootSlot.cs b/ProtoFlux/Users/Avatar/AvatarRootSlot.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using FrooxEngine;
+using FrooxEngine.CommonAvatar;
+using ProtoFlux.Core;
+using ProtoFlux.Runtimes.Execution;
+
+namespace ProtoFlux.Users.Avatar
+{
+    [ContinuouslyChanging]
+    [NodeCategory("ProtoFlux/Obsidian/Avatar")]
+    public class AvatarRootSlot : ObjectFunctionNode<ExecutionContext, Slot>
+    {
+        public readonly ObjectInput<User> User;
+
+        protected override Slot Compute(ExecutionContext context)
+        {
+            User user = User.Evaluate(context);
+            Slot slot = user.Root.Slot;
+            List<AvatarRoot> list = new List<AvatarRoot>();
+            slot.GetFirstDirectComponentsInChildren(list);
+            return user == null || list.Count == 0 ? null : list[0].Slot;
+        }
+    }
+}
diff --git a/ProtoFlux/Users/Status/IsUserInSeatedMode.cs b/ProtoFlux/Users/Status/IsUserInSeatedMode.cs
@@ -0,0 +1,18 @@
+using ProtoFlux.Core;
+using ProtoFlux.Runtimes.Execution;
+
+namespace FrooxEngine.ProtoFlux.Status
+{
+    [ContinuouslyChanging]
+    [NodeCategory("ProtoFlux/Obsidian/Status")]
+    public class IsUserInSeatedModeNode : ValueFunctionNode<ExecutionContext, bool>
+    {
+        public readonly ObjectInput<User> User;
+
+        protected override bool Compute(ExecutionContext context)
+        {
+            User user = User.Evaluate(context);
+            return user == null ? false : user.InputInterface.SeatedMode;
+        }
+    }
+}