From ecc7628aab3a012969696b152c69166ff78122c6 Mon Sep 17 00:00:00 2001 From: Nytra <14206961+Nytra@users.noreply.github.com> Date: Wed, 27 Nov 2024 19:59:58 +0000 Subject: [PATCH 1/3] Eye tracking node fix --- ProjectObsidian/ProtoFlux/Users/Status/IsUserEyeTracking.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ProjectObsidian/ProtoFlux/Users/Status/IsUserEyeTracking.cs b/ProjectObsidian/ProtoFlux/Users/Status/IsUserEyeTracking.cs index f468577..2600486 100644 --- a/ProjectObsidian/ProtoFlux/Users/Status/IsUserEyeTracking.cs +++ b/ProjectObsidian/ProtoFlux/Users/Status/IsUserEyeTracking.cs @@ -22,7 +22,10 @@ protected override bool Compute(FrooxEngineContext context) if (eyeTrackingStreamManager != null) { EyeSide side = Side.Evaluate(context); - return eyeTrackingStreamManager.GetIsTracking(side); + if (side != EyeSide.Combined) + { + return eyeTrackingStreamManager.GetIsTracking(side); + } } } return false; From 6d8b336520cc5611e2e60e21c4c8874716944326 Mon Sep 17 00:00:00 2001 From: Nytra <14206961+Nytra@users.noreply.github.com> Date: Wed, 27 Nov 2024 20:18:22 +0000 Subject: [PATCH 2/3] Fix EyeSide enum --- ProjectObsidian/ProtoFlux/Users/Status/IsUserEyeTracking.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ProjectObsidian/ProtoFlux/Users/Status/IsUserEyeTracking.cs b/ProjectObsidian/ProtoFlux/Users/Status/IsUserEyeTracking.cs index 2600486..51a8605 100644 --- a/ProjectObsidian/ProtoFlux/Users/Status/IsUserEyeTracking.cs +++ b/ProjectObsidian/ProtoFlux/Users/Status/IsUserEyeTracking.cs @@ -1,6 +1,5 @@ using FrooxEngine; using FrooxEngine.ProtoFlux; -using FrooxEngine.ProtoFlux.Runtimes.Execution.Nodes; using ProtoFlux.Core; using ProtoFlux.Runtimes.Execution; @@ -11,7 +10,7 @@ namespace ProtoFlux.Runtimes.Execution.Nodes.Obsidian.Users.Status public class IsUserEyeTracking : ValueFunctionNode { public readonly ObjectInput User; - public readonly ObjectInput Side; + public readonly ValueInput Side; protected override bool Compute(FrooxEngineContext context) { From 53f0c1bdf7cef0d23fefaeffa53fc01d2b013daa Mon Sep 17 00:00:00 2001 From: Nytra <14206961+Nytra@users.noreply.github.com> Date: Wed, 27 Nov 2024 21:33:38 +0000 Subject: [PATCH 3/3] Adjust combined side --- ProjectObsidian/ProtoFlux/Users/Status/IsUserEyeTracking.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ProjectObsidian/ProtoFlux/Users/Status/IsUserEyeTracking.cs b/ProjectObsidian/ProtoFlux/Users/Status/IsUserEyeTracking.cs index 51a8605..27f9d31 100644 --- a/ProjectObsidian/ProtoFlux/Users/Status/IsUserEyeTracking.cs +++ b/ProjectObsidian/ProtoFlux/Users/Status/IsUserEyeTracking.cs @@ -25,6 +25,10 @@ protected override bool Compute(FrooxEngineContext context) { return eyeTrackingStreamManager.GetIsTracking(side); } + else + { + return eyeTrackingStreamManager.GetIsTracking(EyeSide.Left) && eyeTrackingStreamManager.GetIsTracking(EyeSide.Right); + } } } return false;