Fixup package names/locations

Regression-Games · Dec 13, 2024 · 52f05ec · 52f05ec
1 parent 403f9d0
commit 52f05ec
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 11 deletions.
diff --git a/...egression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/ActionExplorationDriver.cs b/...egression.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/ActionExplorationDriver.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using RegressionGames;
 using RegressionGames.StateRecorder.BotSegments.Models;
-using RegressionGames.StateRecorder.BotSegments.Models.KeyMoments.BotActions;
+using RegressionGames.StateRecorder.BotSegments.Models.BotActions.KeyMoments;
 using RegressionGames.StateRecorder.Models;
 using UnityEngine;
 

diff --git a/...ion.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/BotSegmentsPlaybackController.cs b/...ion.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/BotSegmentsPlaybackController.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using Newtonsoft.Json;
 using RegressionGames.StateRecorder.BotSegments.Models;
-using RegressionGames.StateRecorder.BotSegments.Models.KeyMoments;
+using RegressionGames.StateRecorder.BotSegments.Models.BotActions.KeyMoments;
 using RegressionGames.StateRecorder.Models;
 using StateRecorder.BotSegments;
 using StateRecorder.BotSegments.Models;

diff --git a/...y.bots/Runtime/Scripts/StateRecorder/BotSegments/JsonConverters/BotActionJsonConverter.cs b/...y.bots/Runtime/Scripts/StateRecorder/BotSegments/JsonConverters/BotActionJsonConverter.cs
@@ -3,7 +3,7 @@
 using Newtonsoft.Json.Linq;
 using RegressionGames.StateRecorder.BotSegments.Models;
 using RegressionGames.StateRecorder.BotSegments.Models.BotActions;
-using RegressionGames.StateRecorder.BotSegments.Models.KeyMoments.BotActions;
+using RegressionGames.StateRecorder.BotSegments.Models.BotActions.KeyMoments;
 
 
 namespace RegressionGames.StateRecorder.BotSegments.JsonConverters

diff --git a/...corder/BotSegments/Models/KeyMoments.meta → ...egments/Models/BotActions/KeyMoments.meta b/...corder/BotSegments/Models/KeyMoments.meta → ...egments/Models/BotActions/KeyMoments.meta
diff --git a/...odels/KeyMoments/IKeyMomentExploration.cs → ...tions/KeyMoments/IKeyMomentExploration.cs b/...odels/KeyMoments/IKeyMomentExploration.cs → ...tions/KeyMoments/IKeyMomentExploration.cs
@@ -1,4 +1,4 @@
-namespace RegressionGames.StateRecorder.BotSegments.Models.KeyMoments
+namespace RegressionGames.StateRecorder.BotSegments.Models.BotActions.KeyMoments
 {
     public interface IKeyMomentExploration
     {

diff --git a/.../KeyMoments/IKeyMomentExploration.cs.meta → .../KeyMoments/IKeyMomentExploration.cs.meta b/.../KeyMoments/IKeyMomentExploration.cs.meta → .../KeyMoments/IKeyMomentExploration.cs.meta
diff --git a/...ts/BotActions/KeyMomentMouseActionData.cs → ...ns/KeyMoments/KeyMomentMouseActionData.cs b/...ts/BotActions/KeyMomentMouseActionData.cs → ...ns/KeyMoments/KeyMomentMouseActionData.cs
@@ -10,7 +10,7 @@
 
 // ReSharper disable InconsistentNaming
 
-namespace RegressionGames.StateRecorder.BotSegments.Models.KeyMoments.BotActions
+namespace RegressionGames.StateRecorder.BotSegments.Models.BotActions.KeyMoments
 {
     [Serializable]
     public class PreconditionNormalizedPathData
@@ -642,6 +642,7 @@ private Vector2 GetClickPositionForMatch((ObjectStatus, (float,float,float,float
                             var preconditionMatchesI = preconditionMatches[i];
                             if (preconditionMatchesI.Count > 0)
                             {
+                                // TODO: Currently this narrows the bounds.. but can cause you to actually get further from the original click position... i think we need to consider the 'most' overlapping match with the original for similar objects before choosing to narrow
                                 foreach (var preconditionMatchI in preconditionMatchesI)
                                 {
                                     var isInteractable = true;

diff --git a/...tActions/KeyMomentMouseActionData.cs.meta → ...yMoments/KeyMomentMouseActionData.cs.meta b/...tActions/KeyMomentMouseActionData.cs.meta → ...yMoments/KeyMomentMouseActionData.cs.meta
diff --git a/...on.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments/BotActions.meta b/...on.unity.bots/Runtime/Scripts/StateRecorder/BotSegments/Models/KeyMoments/BotActions.meta
diff --git a/...regression.unity.bots/Runtime/Scripts/StateRecorder/KeyMoments/MouseKeyMomentEvaluator.cs b/...regression.unity.bots/Runtime/Scripts/StateRecorder/KeyMoments/MouseKeyMomentEvaluator.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using RegressionGames.StateRecorder.BotSegments.Models;
 using RegressionGames.StateRecorder.BotSegments.Models.BotCriteria;
-using RegressionGames.StateRecorder.BotSegments.Models.KeyMoments.BotActions;
+using RegressionGames.StateRecorder.BotSegments.Models.BotActions.KeyMoments;
 using RegressionGames.StateRecorder.Models;
 
 namespace RegressionGames.StateRecorder.KeyMoments

diff --git a/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/ScreenRecorder.cs b/src/gg.regression.unity.bots/Runtime/Scripts/StateRecorder/ScreenRecorder.cs
@@ -9,14 +9,12 @@
 using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
-using Newtonsoft.Json;
 using RegressionGames.ActionManager;
 using RegressionGames.CodeCoverage;
 using RegressionGames.RemoteOrchestration;
 using RegressionGames.StateRecorder.BotSegments.Models;
 using RegressionGames.StateRecorder.BotSegments.Models.BotActions;
 using RegressionGames.StateRecorder.BotSegments.Models.BotCriteria;
-using RegressionGames.StateRecorder.BotSegments.Models.KeyMoments.BotActions;
 using RegressionGames.StateRecorder.Models;
 using StateRecorder.BotSegments;
 #if UNITY_EDITOR